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

Commit ba003a97 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 139dbe5c 0435e5e7

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