Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nathan Harold
2019-10-29 18:20:19 +00:00
committed by Android (Google) Code Review
parent 7baf85ccaf b09250e794
commit 766c011ff0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/TelephonyManager.java
View File

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