Merge "Update DynamicAndroidService for IGsiService AIDL changes." am: 1451b2f3a5 am: 123a9ed245

am: 2f2970f242

Change-Id: I32e35f22b5ed5e7d04f2b3df50bba4d3bea4f1f3

1 files changed, 4 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/DynamicAndroidService.java b/services/core/java/com/android/server/DynamicAndroidService.java
index 12a3f02325d2..8488941587fb 100644
--- a/services/core/java/com/android/server/DynamicAndroidService.java
+++ b/services/core/java/com/android/server/DynamicAndroidService.java
@@ -118,7 +118,9 @@ public class DynamicAndroidService extends IDynamicAndroidService.Stub implement
         if (gsiService.isGsiRunning()) {
             return gsiService.disableGsiInstall();
         } else {
-            return gsiService.setGsiBootable() == 0;
+            final int status = gsiService.getGsiBootStatus();
+            final boolean singleBoot = (status == IGsiService.BOOT_STATUS_SINGLE_BOOT);
+            return gsiService.setGsiBootable(singleBoot) == 0;
         }
     }
 
@@ -129,6 +131,6 @@ public class DynamicAndroidService extends IDynamicAndroidService.Stub implement
 
     @Override
     public boolean commit() throws RemoteException {
-        return getGsiService().setGsiBootable() == 0;
+        return getGsiService().setGsiBootable(true) == 0;
     }
 }