Merge "[Companion] Fix NPE in associate" into oc-dev

am: ba003a97f8 Change-Id: Ib65cfee5e317b03ce57dc4cc695241dc62aaf282
2017-06-19 22:02:14 +00:00
parent 2102c3211c ba003a97f8
commit 5cb26b76ff
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/companion/CompanionDeviceManager.java
+++ b/core/java/android/companion/CompanionDeviceManager.java
@@ -288,6 +288,7 @@ public final class CompanionDeviceManager {

        @Override
        public void onActivityDestroyed(Activity activity) {
+            if (activity != getActivity()) return;
            try {
                mService.stopScan(mRequest, this, getCallingPackage());
            } catch (RemoteException e) {