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

Commit 3a74c7ac authored by Eugene Susla's avatar Eugene Susla
Browse files

[Companion] Prevent NPE in CallbackProxy 

Fixes: 63383044
Test: Ensure all fields of CompanionDeviceManager.CallbackProxy are
null-checked in onSuccess and onFailure
Change-Id: If95a46686f74d184bccfcb2d8c8195add4747a07
parent 150fec44

core/java/android/companion/CompanionDeviceManager.java

+14 −2
Original line number Diff line number Diff line
@@ -280,12 +280,24 @@ public final class CompanionDeviceManager { 


        @Override

        public void onSuccess(PendingIntent launcher) {

            mHandler.post(() -> mCallback.onDeviceFound(launcher.getIntentSender()));

            Handler handler = mHandler;

            if (handler == null) return;

            handler.post(() -> {

                Callback callback = mCallback;

                if (callback == null) return;

                callback.onDeviceFound(launcher.getIntentSender());

            });

        }



        @Override

        public void onFailure(CharSequence reason) {

            mHandler.post(() -> mCallback.onFailure(reason));

            Handler handler = mHandler;

            if (handler == null) return;

            handler.post(() -> {

                Callback callback = mCallback;

                if (callback == null) return;

                callback.onFailure(reason);

            });

        }



        @Override