From 8eac3a3ff1db4467841f48119546abb0ee172647 Mon Sep 17 00:00:00 2001
From: Zoey Chen <zoeychen@google.com>
Date: Thu, 18 Mar 2021 11:05:12 +0800
Subject: [PATCH] [Telephony] Return if context is null when register
 TelephonyCallback

Bug: 183064691
Test: make
Change-Id: Ic77a6085f05c942dcd7514bc78b7bfa46938ec38
---
 telephony/java/android/telephony/TelephonyManager.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 23dcee6387b85..c4e91a1537692 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -14576,6 +14576,11 @@ public class TelephonyManager {
      */
     public void registerTelephonyCallback(@NonNull @CallbackExecutor Executor executor,
             @NonNull TelephonyCallback callback) {
+
+        if (mContext == null) {
+            throw new IllegalStateException("telephony service is null.");
+        }
+
         if (executor == null || callback == null) {
             throw new IllegalArgumentException("TelephonyCallback and executor must be non-null");
         }