Disconnect from WebAPK service when the WebAPK is stopped

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Intent;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.PageTransition;
+import org.chromium.webapk.lib.client.WebApkServiceConnectionManager;
 
 /**
  * An Activity is designed for WebAPKs (native Android apps) and displays a webapp in a nearly
  * UI-less Chrome.
  */
 public class WebApkActivity extends WebappActivity {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         // We could bring a WebAPK hosted WebappActivity to foreground and navigate it to a
@@ skipping 10 matching lines @@
                     new LoadUrlParams(overrideUrl, PageTransition.AUTO_TOPLEVEL));
         }
     }
 
     @Override
     protected void initializeSplashScreenWidgets(final int backgroundColor) {
         // TODO(hanxi): Removes this function and use {@link WebApkActivity}'s implementation
         // when WebAPKs are registered in WebappRegistry.
         initializeSplashScreenWidgets(backgroundColor, null);
     }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        String packageName = getWebappInfo().webApkPackageName();
+        WebApkServiceConnectionManager.getInstance().disconnect(
+                ContextUtils.getApplicationContext(), packageName);
+    }
 }