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

Commit 18b5de5e 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: Id9ba3368eda4c6d1d015f8f6073232aa6cb925ac
parents ba7094cb ba003a97

core/java/android/companion/CompanionDeviceManager.java

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