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

framework/java/android/bluetooth/le/ScanRecord.java

+3 −0

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