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" am: 994f656312

Browse Source 
am: 32d164ba41

Change-Id: I57b40eb0cbaaca86367e81adf5f95875fbed2da2
This commit is contained in:
Nathan Harold
2019-10-15 15:55:00 -07:00
committed by android-build-merger
parent 914861c2e0 32d164ba41
commit e9fa64cc5c
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

@@ -5482,7 +5482,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());
@@ -5522,7 +5523,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) {