diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 8bd86259362b7..cf6cc3fa03291 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5435,7 +5435,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()); @@ -5475,7 +5476,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) {