Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c675cf85 authored by Eugene Susla's avatar Eugene Susla Committed by android-build-merger
Browse files

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

am: ba003a97

Change-Id: I690b6d88bcce507d7fbae855cd9939616ac86212
parents 3fd42157 ba003a97

core/java/android/companion/CompanionDeviceManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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) {