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

Commit 0435e5e7 authored by Eugene Susla's avatar Eugene Susla
Browse files

[Companion] Fix NPE in associate 

The root cause of the exception was that the activity destroy listener was
reacting to any activity being destroyed instead of just the one used with
the CompanionDeviceManager

Fixes: 62549525
Test: Ensure the attached bug no longer reproduces
Change-Id: I2f977e9ac9176247f5be9d08d19b3875f2b4a703
parent ffd8343b

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