Merge "Check for null executor" into qt-r1-dev

am: 2f952a8462

Change-Id: Ia7b6761ddfdd41abcb2b3239ef71326ff7864dcd
This commit is contained in:
Sooraj Sasindran
2019-06-24 18:35:23 -07:00
committed by android-build-merger

View File

@@ -10922,6 +10922,9 @@ public class TelephonyManager {
try { try {
IOns iOpportunisticNetworkService = getIOns(); IOns iOpportunisticNetworkService = getIOns();
if (iOpportunisticNetworkService == null || availableNetworks == null) { if (iOpportunisticNetworkService == null || availableNetworks == null) {
if (executor == null || callback == null) {
return;
}
Binder.withCleanCallingIdentity(() -> executor.execute(() -> { Binder.withCleanCallingIdentity(() -> executor.execute(() -> {
callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS); callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS);
})); }));