Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d39229

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644386

Change-Id: I3290feb8ffea6f18240995c6d96c3893e2fa4b51

1 files changed, 5 insertions, 0 deletions

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 99b5687ba20d..1ff450a5d6b9 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -14574,6 +14574,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");
         }