From 4b2d134b8c2d41d14428066d80b267c14400a473 Mon Sep 17 00:00:00 2001
From: Sooraj Sasindran <sasindran@google.com>
Date: Mon, 24 Jun 2019 15:17:21 -0700
Subject: [PATCH] Check for null executor

Check for null executor when invalid parameters are passed

Test: build
Bug: 135927110
Change-Id: I12014f4da00d3783506642162ad7668fc7c05d9d
---
 telephony/java/android/telephony/TelephonyManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 2b843cdbfa698..7b3fdf18b6c11 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -10884,6 +10884,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);
                 }));