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

Commit fe5f2b2a 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 

am: 5cb26b76

Change-Id: Ie3c2e7154357a51b4947c807347650456297d81d
parents 33fee827 5cb26b76

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) {