diff options
author | 2023-12-19 08:47:07 +0000 | |
---|---|---|
committer | 2023-12-19 08:47:07 +0000 | |
commit | 96bbd316b8c3511d8554806e24b414a84b366c5b (patch) | |
tree | 6959002f7acd7d9dc23b03f32df66d753ad1219d | |
parent | fa4562370315cf87e7165e3f987eb8b0e4e3fd38 (diff) | |
parent | caf4f792d4af3f1407bd4a782e1cf14463fdc1d9 (diff) |
Merge "Add a flag to control activity snapshot by default." into main
-rw-r--r-- | core/java/android/window/flags/windowing_frontend.aconfig | 8 | ||||
-rw-r--r-- | services/core/java/com/android/server/wm/ActivitySnapshotController.java | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 52ad49a7cf28..216acdce38fb 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -66,4 +66,12 @@ flag { description: "Predictive back for system animations" bug: "309545085" is_fixed_read_only: true +} + +flag { + name: "activity_snapshot_by_default" + namespace: "systemui" + description: "Enable record activity snapshot by default" + bug: "259497289" + is_fixed_read_only: true }
\ No newline at end of file diff --git a/services/core/java/com/android/server/wm/ActivitySnapshotController.java b/services/core/java/com/android/server/wm/ActivitySnapshotController.java index 86be6ba5e6ad..7af494c296de 100644 --- a/services/core/java/com/android/server/wm/ActivitySnapshotController.java +++ b/services/core/java/com/android/server/wm/ActivitySnapshotController.java @@ -33,6 +33,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.server.LocalServices; import com.android.server.pm.UserManagerInternal; import com.android.server.wm.BaseAppSnapshotPersister.PersistInfoProvider; +import com.android.window.flags.Flags; import java.io.File; import java.util.ArrayList; @@ -121,7 +122,8 @@ class ActivitySnapshotController extends AbsAppSnapshotController<ActivityRecord // TODO remove when enabled static boolean isSnapshotEnabled() { - return SystemProperties.getInt("persist.wm.debug.activity_screenshot", 0) != 0; + return SystemProperties.getInt("persist.wm.debug.activity_screenshot", 0) != 0 + || Flags.activitySnapshotByDefault(); } static PersistInfoProvider createPersistInfoProvider( |