Merge "Check for null executor" into qt-r1-dev am: 2f952a8462

am: aae64e716d Change-Id: I95963891a90e8e04e05b986d3e4b1d6be6f72981
2019-06-25 02:31:58 -07:00
parent 57af259767 aae64e716d
commit 525d8747c0
1 changed files with 3 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -10922,6 +10922,9 @@ public class TelephonyManager {
        try {
            IOns iOpportunisticNetworkService = getIOns();
            if (iOpportunisticNetworkService == null || availableNetworks == null) {
+                if (executor == null || callback == null) {
+                    return;
+                }
                Binder.withCleanCallingIdentity(() -> executor.execute(() -> {
                    callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS);
                }));