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

Commit 51f11f9b 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" am: a805d392 

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

Change-Id: I3290feb8ffea6f18240995c6d96c3893e2fa4b51
parents d6872459 a805d392

telephony/java/android/telephony/TelephonyManager.java

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















        }