From 4c2aa61202f906f52d3e5bd7f0910b0a4d837fae Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Wed, 28 Nov 2018 23:36:53 +0100
Subject: Bluetooth: Fix NPE when accesing Manufacturer Data of invalid
 ScanRecord

Bug: 118805852
Test: compilation
Change-Id: I537bec61cd3e7df700cc972683458f977ff370b8
---
 core/java/android/bluetooth/le/ScanRecord.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/bluetooth/le/ScanRecord.java b/core/java/android/bluetooth/le/ScanRecord.java
index 7988008f03c0..2174255a3619 100644
--- a/core/java/android/bluetooth/le/ScanRecord.java
+++ b/core/java/android/bluetooth/le/ScanRecord.java
@@ -116,6 +116,9 @@ public final class ScanRecord {
      */
     @Nullable
     public byte[] getManufacturerSpecificData(int manufacturerId) {
+        if (mManufacturerSpecificData == null) {
+            return null;
+        }
         return mManufacturerSpecificData.get(manufacturerId);
     }
 
-- 
cgit v1.2.3-59-g8ed1b