Merge "ScanRecord.getServiceData NPE fix" (8d0eb018) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);