Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3cac8f0245a257838bd486a8cc069cde8e2b2b69
This commit is contained in:
TreeHugger Robot
2021-07-08 03:48:16 +00:00
committed by Automerger Merge Worker
parent 85747f045c 682aa90930
commit 7fedf9af99
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java
View File

@@ -317,6 +317,9 @@ public class CompanionDeviceDiscoveryService extends Service {
} }
void onDeviceSelected(String callingPackage, String deviceAddress) { void onDeviceSelected(String callingPackage, String deviceAddress) {
if (callingPackage == null || deviceAddress == null) {
return;
}
mServiceCallback.complete(new Association( mServiceCallback.complete(new Association(
getUserId(), deviceAddress, callingPackage, mRequest.getDeviceProfile(), false, getUserId(), deviceAddress, callingPackage, mRequest.getDeviceProfile(), false,
System.currentTimeMillis())); System.currentTimeMillis()));