commit 32d164ba41013019838f3631a8410b2fdd17da86
author Nathan Harold <nharold@google.com> Tue Oct 15 15:45:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 15 15:45:04 2019 -0700
tree 05eb305d6bf9e87cb7ded80b938c5d9b57d40832
parent fd5d074f49acaa9fac731d47e5e50f81839b4542
parent 994f656312715e44c0cb28504100ba5006b79fda

Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null"
am: 994f656312

Change-Id: I04af3edc7430db678bb1fb3f53d3f245d16f5f7d

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 9d77a56..b25f373 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5482,7 +5482,8 @@
                         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 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) {