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

2017-06-19 21:52:14 +00:00
parent 139dbe5c1c 0435e5e79f
commit ba003a97f8
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) {