commit 28e76d58a5cde619359800bf55666100bc23aa39
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 02 14:01:25 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 02 14:01:25 2023 +0000
tree 317fefd1958050613ed182919a9664b5bf1a76fb
parent a82a21c01772197ea5ef03f9627f1e90b19cbf74
parent 0a68ae7eaed78b33d9e5bf5edcdd15e818bc5d16

Merge "Do not record snapshot when snapshots are disabled" into udc-dev

services/core/java/com/android/server/wm/AbsAppSnapshotController.java

diff --git a/services/core/java/com/android/server/wm/AbsAppSnapshotController.java b/services/core/java/com/android/server/wm/AbsAppSnapshotController.java
index bd07622..10a2b97 100644
--- a/services/core/java/com/android/server/wm/AbsAppSnapshotController.java
+++ b/services/core/java/com/android/server/wm/AbsAppSnapshotController.java
@@ -167,6 +167,9 @@
     }
 
     final TaskSnapshot recordSnapshotInner(TYPE source, boolean allowSnapshotHome) {
+        if (shouldDisableSnapshots()) {
+            return null;
+        }
         final boolean snapshotHome = allowSnapshotHome && source.isActivityTypeHome();
         final TaskSnapshot snapshot = captureSnapshot(source, snapshotHome);
         if (snapshot == null) {