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

Merge "ScanRecord.getServiceData NPE fix" am: d62f74e806

Browse Source 
am: 8d0eb01843

Change-Id: I9a7e94cb51f724da7d089fbe027a06d36ad5ebb4
This commit is contained in:
Jakub Pawlowski
2018-06-11 09:16:39 -07:00
committed by android-build-merger
parent 3ef3fae232 8d0eb01843
commit 00f135d1be
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/bluetooth/le/ScanRecord.java
View File

@@ -117,7 +117,7 @@ public final class ScanRecord {
*/ */
@Nullable @Nullable
public byte[] getServiceData(ParcelUuid serviceDataUuid) { public byte[] getServiceData(ParcelUuid serviceDataUuid) {
if (serviceDataUuid == null) { if (serviceDataUuid == null || mServiceData == null) {
return null; return null;
} }
return mServiceData.get(serviceDataUuid); return mServiceData.get(serviceDataUuid);