diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/pm/ApexManager.java b/services/core/java/com/android/server/pm/ApexManager.java index 4f9b3962a9ea..1222d9a29baf 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 @@ abstract class ApexManager { * * @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 @@ abstract class ApexManager { } @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 @@ abstract class ApexManager { } @Override - boolean abortActiveSession() { + boolean revertActiveSessions() { throw new UnsupportedOperationException(); } diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java index 845f06d1ce5f..27eefc6f71c0 100644 --- a/services/core/java/com/android/server/pm/StagingManager.java +++ b/services/core/java/com/android/server/pm/StagingManager.java @@ -322,7 +322,7 @@ public class StagingManager { return; } - if (!mApexManager.abortActiveSession()) { + if (!mApexManager.revertActiveSessions()) { Slog.e(TAG, "Failed to abort APEXd session"); } else { Slog.e(TAG, diff --git a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java index 6bb4202fa759..178f38aac0b7 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/ApexManagerTest.java @@ -217,11 +217,11 @@ public class ApexManagerTest { } @Test - public void testAbortActiveSession_remoteException() throws RemoteException { - doThrow(RemoteException.class).when(mApexService).abortActiveSession(); + public void testRevertActiveSessions_remoteException() throws RemoteException { + doThrow(RemoteException.class).when(mApexService).revertActiveSessions(); try { - assertThat(mApexManager.abortActiveSession()).isFalse(); + assertThat(mApexManager.revertActiveSessions()).isFalse(); } catch (Exception e) { throw new AssertionError("ApexManager should not raise Exception"); } |