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

Merge "Remove blocking binder calls from isInUse method" am: 4bef55860f am: e7e3c7ec10

Browse Source 
Change-Id: Ia36ad74c1f55932556bdd1a6e72e6835767159b7
This commit is contained in:
Automerger Merge Worker
2019-12-31 02:54:31 +00:00
parent a11a36187c e7e3c7ec10
commit 944268b72e
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,18 +179,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements
@Override @Override
public boolean isInUse() throws RemoteException { public boolean isInUse() throws RemoteException {
boolean gsidWasRunning = "running".equals(SystemProperties.get("init.svc.gsid")); return SystemProperties.getBoolean("ro.gsid.image_running", false);
boolean isInUse = false;
try {
isInUse = getGsiService().isGsiRunning();
} finally {
if (!gsidWasRunning && !isInUse) {
mGsiService = null;
}
}
return isInUse;
} }
@Override @Override