commit 4bef55860f71b7820f19dca5c5cb4afa501e0e2b
author Howard Chen <howardsoc@google.com> Tue Dec 31 02:34:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 31 02:34:32 2019 +0000
tree 1103847ecb8d041f1e3b229811f0bba88a92d61e
parent 8afb2bf120847f56b9e488624e5e527227e2c134
parent 07fcb2fc5bd017c06a26ab669efddd4cb5d281e3

Merge "Remove blocking binder calls from isInUse method"

services/core/java/com/android/server/DynamicSystemService.java

diff --git a/services/core/java/com/android/server/DynamicSystemService.java b/services/core/java/com/android/server/DynamicSystemService.java
index 7b02b6e..7909e30 100644
--- a/services/core/java/com/android/server/DynamicSystemService.java
+++ b/services/core/java/com/android/server/DynamicSystemService.java
@@ -179,18 +179,7 @@
 
     @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