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

Update DynamicAndroidService for IGsiService AIDL changes.

Browse Source 
Bug: 125540538
Test: framework builds
Change-Id: I7c7f5053d02b231c4d987a145034683ff325e276
This commit is contained in:
David Anderson
2019-02-27 13:45:34 -08:00
parent 049867e364
commit 8ee0674e09
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()) {
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;
}
}