Commit 9676bc2d authored Nov 29, 2018 by Jakub Pawlowski Committed by android-build-merger Nov 29, 2018

Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid...

Merge "Bluetooth: Fix NPE when accesing Manufacturer Data of invalid ScanRecord" am: 658e6530 am: 591a68a5
am: 587a8acb

Change-Id: I88459ae16e0492ea877983252aae03ad5714a306

parents 9ab9d46a 587a8acb

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);
		}