Merge "ScanRecord.getServiceData NPE fix"

2018-06-11 14:43:57 +00:00
parent bfe3b1a691 59880123d7
commit d62f74e806
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);