diff options
| author | 2021-11-03 18:27:35 +0000 | |
|---|---|---|
| committer | 2021-11-03 18:27:35 +0000 | |
| commit | c2810b93854d213736e6139dba757c2918ab9672 (patch) | |
| tree | eccc718b3d4b3163b3839998039a916f3f9973b8 | |
| parent | 02c816b85c6dde11bb6a2232212ac0351e4fe57f (diff) | |
| parent | beaf2171c2a0a922cddb526af3a351e2932ab4f3 (diff) | |
Backport 'add config to disable snapshots'. am: 44dfd78b29 am: beaf2171c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870936
Change-Id: If56bbf2b4267b991bd2d580506e3f77b80f148c4
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskSnapshotController.java | 10 |
3 files changed, 16 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 5ba5d3e38dd1..3fdcbe760df6 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5061,4 +5061,7 @@ <!-- the number of the max cached processes in the system. --> <integer name="config_customizedMaxCachedProcesses">32</integer> + + <!-- Whether this device should support taking app snapshots on closure --> + <bool name="config_disableTaskSnapshots">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 19c692140f15..ebb42c46e7d0 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4405,7 +4405,7 @@ <java-symbol type="string" name="view_and_control_notification_title" /> <java-symbol type="string" name="view_and_control_notification_content" /> <java-symbol type="array" name="config_accessibility_allowed_install_source" /> - + <!-- Translation --> <java-symbol type="string" name="ui_translation_accessibility_translated_text" /> <java-symbol type="string" name="ui_translation_accessibility_translation_finished" /> @@ -4432,4 +4432,7 @@ <java-symbol type="array" name="config_sharedLibrariesLoadedAfterApp" /> <java-symbol type="integer" name="config_customizedMaxCachedProcesses" /> + + <java-symbol type="bool" name="config_disableTaskSnapshots" /> + </resources> diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index e74371036619..a518222c3bde 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -118,6 +118,11 @@ class TaskSnapshotController { */ private final boolean mIsRunningOnWear; + /** + * Flag indicating if device configuration has disabled app snapshots. + */ + private final boolean mConfigDisableTaskSnapshots; + TaskSnapshotController(WindowManagerService service) { mService = service; mPersister = new TaskSnapshotPersister(mService, Environment::getDataSystemCeDirectory); @@ -131,6 +136,8 @@ class TaskSnapshotController { PackageManager.FEATURE_WATCH); mHighResTaskSnapshotScale = mService.mContext.getResources().getFloat( com.android.internal.R.dimen.config_highResTaskSnapshotScale); + mConfigDisableTaskSnapshots = mService.mContext.getResources().getBoolean( + com.android.internal.R.bool.config_disableTaskSnapshots); } void systemReady() { @@ -488,7 +495,8 @@ class TaskSnapshotController { } boolean shouldDisableSnapshots() { - return mIsRunningOnWear || mIsRunningOnTv || mIsRunningOnIoT; + return mIsRunningOnWear || mIsRunningOnTv || mIsRunningOnIoT + || mConfigDisableTaskSnapshots; } /** |