Merge "Remove blocking binder calls from isInUse method" am: 4bef55860f am:... (cce904a3) · Commits · e / os / android_frameworks_base

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

+1 −12

Original line number	Diff line number	Diff line
		@@ -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