Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" (994f6563) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -5455,7 +5455,8 @@ public class TelephonyManager {
		public void onError(int errorCode, android.os.ParcelableException detail) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() -> callback.onError(
		errorCode, detail.getCause())));
		errorCode,
		detail == null ? null : detail.getCause())));
		}
		}, getOpPackageName());

		@@ -5495,7 +5496,8 @@ public class TelephonyManager {
		public void onError(int errorCode, android.os.ParcelableException detail) {
		Binder.withCleanCallingIdentity(() ->
		executor.execute(() -> callback.onError(
		errorCode, detail.getCause())));
		errorCode,
		detail == null ? null : detail.getCause())));
		}
		}, getOpPackageName(), workSource);
		} catch (RemoteException ex) {