Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-19 21:52:14 +00:00
committed by Android (Google) Code Review
parent 139dbe5c1c 0435e5e79f
commit ba003a97f8
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/companion/CompanionDeviceManager.java
View File

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