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"

Browse Source
This commit is contained in:
Nathan Harold
2019-10-15 22:29:52 +00:00
committed by Gerrit Code Review
parent 6ddfde96fd fff052067c
commit 994f656312
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

@@ -5455,7 +5455,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());
@@ -5495,7 +5496,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) {