Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c581fc authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Telephony] Return if context is null when register TelephonyCallback"... 

Merge "[Telephony] Return if context is null when register TelephonyCallback" am: a805d392 am: 51f11f9b am: aab9659d

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

Change-Id: Iee971b6fdac174392e75e1ae49ef09446faf1257
parents 4c460aca aab9659d

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Diff line number Diff line
@@ -15100,6 +15100,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");















        }