commit 9c19f771e017dc60e7c84fcdc9804f9fa22b7f7f
author Harshit Mahajan <harshitmahajan@google.com> Wed Mar 22 12:23:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 12:23:59 2023 +0000
tree 4585b29665677ea63f16a1f491af974d204d8a11
parent 63888fb12a1f0a9e6115ad7953f69bb01fbe59f9
parent f25aeda05885e826db5b0840d4481d134eea4acf

Merge "Fix rollback reason in rollback all case"

services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java

diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
index b12789c..e437be8 100644
--- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
+++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
@@ -129,7 +129,7 @@
     public boolean execute(@Nullable VersionedPackage failedPackage,
             @FailureReasons int rollbackReason, int mitigationCount) {
         if (rollbackReason == PackageWatchdog.FAILURE_REASON_NATIVE_CRASH) {
-            mHandler.post(this::rollbackAll);
+            mHandler.post(() -> rollbackAll(rollbackReason));
             return true;
         }
 
@@ -141,7 +141,7 @@
             }
             mHandler.post(() -> rollbackPackage(rollback, failedPackage, rollbackReason));
         } else if (mitigationCount > 1) {
-            mHandler.post(this::rollbackAll);
+            mHandler.post(() -> rollbackAll(rollbackReason));
         }
 
         // Assume rollbacks executed successfully
@@ -478,7 +478,7 @@
     }
 
     @WorkerThread
-    private void rollbackAll() {
+    private void rollbackAll(@FailureReasons int rollbackReason) {
         assertInWorkerThread();
         RollbackManager rollbackManager = mContext.getSystemService(RollbackManager.class);
         List<RollbackInfo> rollbacks = rollbackManager.getAvailableRollbacks();
@@ -497,7 +497,7 @@
 
         for (RollbackInfo rollback : rollbacks) {
             VersionedPackage sample = rollback.getPackages().get(0).getVersionRolledBackFrom();
-            rollbackPackage(rollback, sample, PackageWatchdog.FAILURE_REASON_NATIVE_CRASH);
+            rollbackPackage(rollback, sample, rollbackReason);
         }
     }
 }