Merge "[DO NOT MERGE] Check CellInfoCallback Detail for Null" into qt-qpr1-dev

This commit is contained in:
Nathan Harold
2019-10-29 18:20:19 +00:00
committed by Android (Google) Code Review

View File

@@ -5353,7 +5353,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());
@@ -5393,7 +5394,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) {