diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index aa05b13984ec7..f7e7d0e849325 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5049,4 +5049,7 @@ 32 + + + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 092be40c499e9..9ba1d5f38599d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4403,7 +4403,7 @@ - + @@ -4426,4 +4426,7 @@ + + + diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index e743710366192..a518222c3bdec 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; } /**