Merge "ScanRecord.getServiceData NPE fix"

am: d62f74e806 Change-Id: I11a254cf633dc5cf9a7c53c992bf49b00f3d274e
2018-06-11 09:07:31 -07:00
parent 9f0df265ba d62f74e806
commit 8d0eb01843
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);