commit 5d8d5f9af7fe035d3eab91f8cd4184c3fe986373
author Howard Chen <howardsoc@google.com> Thu Sep 26 06:48:07 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 26 06:48:07 2019 +0000
tree 384517e60271b8088e767e0082ae28b4ca38831d
parent 420bf7121761193d1f4b927d8eec403ff8481d3b
parent 641432142be36c753b092b7dc138aa0214c50d78

Merge "DynamicSystemService: Use IGsid which reference-counts the gsid service."

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 f92d0e0..173d5b0 100644
--- a/services/core/java/com/android/server/DynamicSystemService.java
+++ b/services/core/java/com/android/server/DynamicSystemService.java
@@ -21,6 +21,7 @@
 import android.gsi.GsiInstallParams;
 import android.gsi.GsiProgress;
 import android.gsi.IGsiService;
+import android.gsi.IGsid;
 import android.os.Environment;
 import android.os.IBinder;
 import android.os.IBinder.DeathRecipient;
@@ -61,7 +62,9 @@
          * re-initialized in this case.
          */
         binder.linkToDeath(recipient, 0);
-        return IGsiService.Stub.asInterface(binder);
+
+        IGsid gsid = IGsid.Stub.asInterface(binder);
+        return gsid.getClient();
     }
 
     /** implements DeathRecipient */
@@ -159,7 +162,7 @@
             isInUse = getGsiService().isGsiRunning();
         } finally {
             if (!gsidWasRunning && !isInUse) {
-                SystemProperties.set("ctl.stop", "gsid");
+                mGsiService = null;
             }
         }