Merge "Update DynamicAndroidService for IGsiService AIDL changes."

2019-03-08 17:39:44 +00:00
parent cfd72b9386 8ee0674e09
commit 1451b2f3a5
1 changed files with 4 additions and 2 deletions
--- 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;
    }
 }