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

Merge "Retry getting DynamicSystem service" into qt-dev

Browse Source 
am: 1c891d6772

Change-Id: If322945def546d6159ed42dcff9efcd5159a1c1d
This commit is contained in:
Po-Chien Hsueh
2019-04-11 09:21:07 -07:00
committed by android-build-merger
parent 34f76fa199 1c891d6772
commit a95378684e
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/DynamicSystemService.java
View File

@@ -47,7 +47,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements
private static IGsiService connect(DeathRecipient recipient) throws RemoteException {
IBinder binder = ServiceManager.getService("gsiservice");
if (binder == null) {
throw new RemoteException(NO_SERVICE_ERROR);
return null;
}
/**
* The init will restart gsiservice if it crashed and the proxy object will need to be
@@ -68,26 +68,31 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements
private IGsiService getGsiService() throws RemoteException {
checkPermission();
if (!"running".equals(SystemProperties.get("init.svc.gsid"))) {
SystemProperties.set("ctl.start", "gsid");
for (int sleepMs = 64; sleepMs <= (GSID_ROUGH_TIMEOUT_MS << 1); sleepMs <<= 1) {
try {
Thread.sleep(sleepMs);
} catch (InterruptedException e) {
Slog.e(TAG, "Interrupted when waiting for GSID");
break;
}
for (int sleepMs = 64; sleepMs <= (GSID_ROUGH_TIMEOUT_MS << 1); sleepMs <<= 1) {
synchronized (this) {
if (mGsiService == null) {
mGsiService = connect(this);
}
if ("running".equals(SystemProperties.get("init.svc.gsid"))) {
break;
if (mGsiService != null) {
return mGsiService;
}
}
}
synchronized (this) {
if (mGsiService == null) {
mGsiService = connect(this);
try {
Slog.d(TAG, "GsiService is not ready, wait for " + sleepMs + "ms");
Thread.sleep(sleepMs);
} catch (InterruptedException e) {
Slog.e(TAG, "Interrupted when waiting for GSID");
return null;
}
return mGsiService;
}
throw new RemoteException(NO_SERVICE_ERROR);
}
private void checkPermission() {