Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" (658e6530) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/le/ScanRecord.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,9 @@ public final class ScanRecord {
		*/
		@Nullable
		public byte[] getManufacturerSpecificData(int manufacturerId) {
		if (mManufacturerSpecificData == null) {
		return null;
		}
		return mManufacturerSpecificData.get(manufacturerId);
		}