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

Commit fe53de48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev am: 682aa909 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15223919

Change-Id: I7ee3b666463a2a71a181a4be9406f0de72059a09
parents e729f105 682aa909

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java

+3 −0
Original line number Diff line number Diff line
@@ -317,6 +317,9 @@ public class CompanionDeviceDiscoveryService extends Service { 
    }



    void onDeviceSelected(String callingPackage, String deviceAddress) {

        if (callingPackage == null || deviceAddress == null) {

            return;

        }

        mServiceCallback.complete(new Association(

                getUserId(), deviceAddress, callingPackage, mRequest.getDeviceProfile(), false,

                System.currentTimeMillis()));