From 069c6b50fcd7f5341cdd8196d60cecb14cf9d8bc Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 27 Oct 2021 17:11:36 +0000 Subject: [PATCH] Backport 'add config to disable snapshots'. Bug: 201691826 Test: m Merged-In: I83d9ab4a15a862ea220debdd8da8b3d5673da276 Change-Id: Ibdff22eda7be6c91e2872e5ac3ae8f2fe1e65b69 --- core/res/res/values/config.xml | 3 +++ core/res/res/values/symbols.xml | 2 ++ .../com/android/server/wm/TaskSnapshotController.java | 10 +++++++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 32db1866c151a..8df1f31d08028 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5276,4 +5276,7 @@ M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM14,6h-4L10,4h4v2z + + + false diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 758990df7159d..f80c2220a2864 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4481,4 +4481,6 @@ + + diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index ce93f2495c223..85e49ee4ea05d 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() { @@ -494,7 +501,8 @@ class TaskSnapshotController { } boolean shouldDisableSnapshots() { - return mIsRunningOnWear || mIsRunningOnTv || mIsRunningOnIoT; + return mIsRunningOnWear || mIsRunningOnTv || mIsRunningOnIoT + || mConfigDisableTaskSnapshots; } /**