commit 1a96eb6dc37f491f76785e18c82b27fec7242685
author Mohammad Samiul Islam <samiul@google.com> Thu Nov 21 10:38:06 2019 +0000
committer Mohammad Samiul Islam <samiul@google.com> Tue Nov 26 11:45:33 2019 +0000
tree 267c28ad4baa2fd5597a1ef6fe81faca9e2ea89c
parent f80a75182c02a4a9cf0c450802710be44907da7b

Replace abortActiveSession in StagingManager with revertActiveSessions

Bug: 141843321
Test: atest StagedInstallTest
Change-Id: I7fc5397f86f843cfb956364775af6fa5369037ba

services/core/java/com/android/server/pm/ApexManager.java

diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java
index 4f9b396..1222d9a 100644
--- a/services/core/java/com/android/server/pm/ApexManager.java
+++ b/services/core/java/com/android/server/pm/ApexManager.java
@@ -206,7 +206,7 @@
      *
      * @return {@code true} upon success, {@code false} if any remote exception occurs
      */
-    abstract boolean abortActiveSession();
+    abstract boolean revertActiveSessions();
 
     /**
      * Abandons the staged session with the given sessionId.
@@ -492,9 +492,9 @@
         }
 
         @Override
-        boolean abortActiveSession() {
+        boolean revertActiveSessions() {
             try {
-                mApexService.abortActiveSession();
+                mApexService.revertActiveSessions();
                 return true;
             } catch (RemoteException re) {
                 Slog.e(TAG, "Unable to contact apexservice", re);
@@ -700,7 +700,7 @@
         }
 
         @Override
-        boolean abortActiveSession() {
+        boolean revertActiveSessions() {
             throw new UnsupportedOperationException();
         }