diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 9d77a561ec725..b25f3738afcb8 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5482,7 +5482,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()); @@ -5522,7 +5523,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) {