ScanRecord.getServiceData NPE fix

Bug: 109662587 Change-Id: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a
2018-06-04 10:32:06 -07:00
parent bfe3b1a691
commit 59880123d7
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/bluetooth/le/ScanRecord.java
+++ b/core/java/android/bluetooth/le/ScanRecord.java
@@ -117,7 +117,7 @@ public final class ScanRecord {
     */
    @Nullable
    public byte[] getServiceData(ParcelUuid serviceDataUuid) {
-        if (serviceDataUuid == null) {
+        if (serviceDataUuid == null || mServiceData == null) {
            return null;
        }
        return mServiceData.get(serviceDataUuid);