From c23bcac7630e6e86450ad60d5074e5e204db8ca4 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Wed, 7 Jul 2021 19:55:32 +0000
Subject: [PATCH] Fix potential NPE in CompanionDeviceDiscoveryService

Fix: 192768781

Test: N/A
Change-Id: I8f4f0f9ecc4ffd9b366294e2b2bd263297122acd
---
 .../CompanionDeviceDiscoveryService.java                       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
index 8b448877c15b..c24782e8b310 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
@@ -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()));