Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update DynamicAndroidService for IGsiService AIDL changes."

Browse Source 
am: 1451b2f3a5

Change-Id: I09b53ae751ffdff9e7fa31a8e5ee347bf42a347c
This commit is contained in:
David Anderson
2019-03-08 09:55:40 -08:00
committed by android-build-merger
parent d63ef04944 1451b2f3a5
commit 123a9ed245
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/DynamicAndroidService.java
View File

@@ -118,7 +118,9 @@ public class DynamicAndroidService extends IDynamicAndroidService.Stub implement
if (gsiService.isGsiRunning()) { if (gsiService.isGsiRunning()) {
return gsiService.disableGsiInstall(); return gsiService.disableGsiInstall();
} else { } 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 @Override
public boolean commit() throws RemoteException { public boolean commit() throws RemoteException {
return getGsiService().setGsiBootable() == 0; return getGsiService().setGsiBootable(true) == 0;
} }
} }