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

Change-Id: I8acad02cbee80118e81c25070b68c214a953d03a
2019-12-31 03:10:40 +00:00
parent 957f110dc3 944268b72e
commit cce904a37b
1 changed files with 1 additions and 12 deletions
--- a/services/core/java/com/android/server/DynamicSystemService.java
+++ b/services/core/java/com/android/server/DynamicSystemService.java
@@ -179,18 +179,7 @@ public class DynamicSystemService extends IDynamicSystemService.Stub implements

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

    @Override