Merge "Remove blocking binder calls from isInUse method"

am: 4bef55860f

Change-Id: I2c4274c9c45e0a9347aa7791632e7ff3600edbf9

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"));
+        return SystemProperties.getBoolean("ro.gsid.image_running", false);
-        boolean isInUse = false;
-
-        try {
-            isInUse = getGsiService().isGsiRunning();
-        } finally {
-            if (!gsidWasRunning && !isInUse) {
-                mGsiService = null;
-            }
-        }
-
-        return isInUse;
     }
 
     @Override