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

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

Merge "[Telephony] TelephonyCallback API update" into sc-dev am: 3a8315ab 

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

Change-Id: I645d8147717816702492ec3f23aeacbfe9f32ec5
parents ad4fb4ea 3a8315ab

core/api/current.txt

+24 −28
Original line number Diff line number Diff line
@@ -41921,42 +41921,42 @@ package android.telephony { 
  @Deprecated public class PhoneStateListener {

    ctor @Deprecated public PhoneStateListener();

    ctor @Deprecated public PhoneStateListener(@NonNull java.util.concurrent.Executor);

    method @Deprecated public void onActiveDataSubscriptionIdChanged(int);

    method @Deprecated public void onBarringInfoChanged(@NonNull android.telephony.BarringInfo);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onActiveDataSubscriptionIdChanged(int);

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onBarringInfoChanged(@NonNull android.telephony.BarringInfo);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onCallDisconnectCauseChanged(int, int);

    method @Deprecated public void onCallForwardingIndicatorChanged(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onCallForwardingIndicatorChanged(boolean);

    method @Deprecated @RequiresPermission(value=android.Manifest.permission.READ_PHONE_STATE, conditional=true) public void onCallStateChanged(int, String);

    method @Deprecated public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);

    method @Deprecated public void onCellLocationChanged(android.telephony.CellLocation);

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onCellInfoChanged(java.util.List<android.telephony.CellInfo>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void onCellLocationChanged(android.telephony.CellLocation);

    method @Deprecated public void onDataActivity(int);

    method @Deprecated public void onDataConnectionStateChanged(int);

    method @Deprecated public void onDataConnectionStateChanged(int, int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onDisplayInfoChanged(@NonNull android.telephony.TelephonyDisplayInfo);

    method @Deprecated public void onEmergencyNumberListChanged(@NonNull java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onEmergencyNumberListChanged(@NonNull java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>>);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onImsCallDisconnectCauseChanged(@NonNull android.telephony.ims.ImsReasonInfo);

    method @Deprecated public void onMessageWaitingIndicatorChanged(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);

    method @Deprecated public void onRegistrationFailed(@NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onMessageWaitingIndicatorChanged(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPreciseDataConnectionStateChanged(@NonNull android.telephony.PreciseDataConnectionState);

    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onRegistrationFailed(@NonNull android.telephony.CellIdentity, @NonNull String, int, int, int);

    method @Deprecated public void onServiceStateChanged(android.telephony.ServiceState);

    method @Deprecated public void onSignalStrengthChanged(int);

    method @Deprecated public void onSignalStrengthsChanged(android.telephony.SignalStrength);

    method @Deprecated public void onUserMobileDataStateChanged(boolean);

    field @Deprecated public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 4194304; // 0x400000

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_BARRING_INFO = -2147483648; // 0x80000000

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 4194304; // 0x400000

    field @Deprecated @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public static final int LISTEN_BARRING_INFO = -2147483648; // 0x80000000

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_CALL_DISCONNECT_CAUSES = 33554432; // 0x2000000

    field @Deprecated public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_CALL_FORWARDING_INDICATOR = 8; // 0x8

    field @Deprecated public static final int LISTEN_CALL_STATE = 32; // 0x20

    field @Deprecated public static final int LISTEN_CELL_INFO = 1024; // 0x400

    field @Deprecated public static final int LISTEN_CELL_LOCATION = 16; // 0x10

    field @Deprecated @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public static final int LISTEN_CELL_INFO = 1024; // 0x400

    field @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public static final int LISTEN_CELL_LOCATION = 16; // 0x10

    field @Deprecated public static final int LISTEN_DATA_ACTIVITY = 128; // 0x80

    field @Deprecated public static final int LISTEN_DATA_CONNECTION_STATE = 64; // 0x40

    field @Deprecated public static final int LISTEN_DISPLAY_INFO_CHANGED = 1048576; // 0x100000

    field @Deprecated public static final int LISTEN_EMERGENCY_NUMBER_LIST = 16777216; // 0x1000000

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_EMERGENCY_NUMBER_LIST = 16777216; // 0x1000000

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_IMS_CALL_DISCONNECT_CAUSES = 134217728; // 0x8000000

    field @Deprecated public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int LISTEN_MESSAGE_WAITING_INDICATOR = 4; // 0x4

    field @Deprecated public static final int LISTEN_NONE = 0; // 0x0

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_PRECISE_DATA_CONNECTION_STATE = 4096; // 0x1000

    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000

    field @Deprecated @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public static final int LISTEN_REGISTRATION_FAILURE = 1073741824; // 0x40000000

    field @Deprecated public static final int LISTEN_SERVICE_STATE = 1; // 0x1

    field @Deprecated public static final int LISTEN_SIGNAL_STRENGTH = 2; // 0x2

    field @Deprecated public static final int LISTEN_SIGNAL_STRENGTHS = 256; // 0x100
@@ -42455,10 +42455,6 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public void onActiveDataSubscriptionIdChanged(int);

  }













  public static interface TelephonyCallback.AlwaysReportedSignalStrengthListener {













    method @RequiresPermission("android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH") public void onSignalStrengthsChanged(@NonNull android.telephony.SignalStrength);













  }



























  public static interface TelephonyCallback.BarringInfoListener {















    method @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onBarringInfoChanged(@NonNull android.telephony.BarringInfo);















  }









@@ -42480,7 +42476,7 @@ package android.telephony {













  }





























  public static interface TelephonyCallback.CellInfoListener {













    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void onCellInfoChanged(@NonNull java.util.List<android.telephony.CellInfo>);













    method @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void onCellInfoChanged(@NonNull java.util.List<android.telephony.CellInfo>);















  }





























  public static interface TelephonyCallback.CellLocationListener {









@@ -42488,15 +42484,15 @@ package android.telephony {













  }





























  public static interface TelephonyCallback.DataActivationStateListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onDataActivationStateChanged(int);













    method public void onDataActivationStateChanged(int);















  }





























  public static interface TelephonyCallback.DataActivityListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onDataActivity(int);













    method public void onDataActivity(int);















  }





























  public static interface TelephonyCallback.DataConnectionStateListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onDataConnectionStateChanged(int, int);













    method public void onDataConnectionStateChanged(int, int);















  }





























  public static interface TelephonyCallback.DisplayInfoListener {










@@ -42528,15 +42524,15 @@ package android.telephony {













  }





























  public static interface TelephonyCallback.ServiceStateListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onServiceStateChanged(@NonNull android.telephony.ServiceState);













    method public void onServiceStateChanged(@NonNull android.telephony.ServiceState);















  }





























  public static interface TelephonyCallback.SignalStrengthsListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onSignalStrengthsChanged(@NonNull android.telephony.SignalStrength);













    method public void onSignalStrengthsChanged(@NonNull android.telephony.SignalStrength);















  }





























  public static interface TelephonyCallback.UserMobileDataStateListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onUserMobileDataStateChanged(boolean);













    method public void onUserMobileDataStateChanged(boolean);















  }





























  public final class TelephonyDisplayInfo implements android.os.Parcelable {

























core/api/system-current.txt



+10
−10






























Original line number
Diff line number
Diff line








@@ -11373,15 +11373,15 @@ package android.telephony {













  }





























  @Deprecated public class PhoneStateListener {













    method @Deprecated public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes);













    method @Deprecated public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber);













    method @Deprecated public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber, int);













    method @Deprecated public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onCallAttributesChanged(@NonNull android.telephony.CallAttributes);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void onOutgoingEmergencyCall(@NonNull android.telephony.emergency.EmergencyNumber, int);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber);















    method @Deprecated public void onOutgoingEmergencySms(@NonNull android.telephony.emergency.EmergencyNumber, int);















    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onPreciseCallStateChanged(@NonNull android.telephony.PreciseCallState);













    method @Deprecated public void onRadioPowerStateChanged(int);













    method @Deprecated public void onSrvccStateChanged(int);













    method @Deprecated public void onVoiceActivationStateChanged(int);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void onRadioPowerStateChanged(int);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void onSrvccStateChanged(int);













    method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void onVoiceActivationStateChanged(int);















    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int LISTEN_CALL_ATTRIBUTES_CHANGED = 67108864; // 0x4000000















    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_CALL = 268435456; // 0x10000000















    field @Deprecated @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public static final int LISTEN_OUTGOING_EMERGENCY_SMS = 536870912; // 0x20000000










@@ -11730,14 +11730,14 @@ package android.telephony {













  public class TelephonyCallback {















    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int EVENT_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGED = 23; // 0x17















    field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int EVENT_ALLOWED_NETWORK_TYPE_LIST_CHANGED = 35; // 0x23













    field @RequiresPermission("android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH") public static final int EVENT_ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED = 10; // 0xa













    field public static final int EVENT_ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED = 10; // 0xa















    field @RequiresPermission(allOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public static final int EVENT_BARRING_INFO_CHANGED = 32; // 0x20















    field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int EVENT_CALL_ATTRIBUTES_CHANGED = 27; // 0x1b















    field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int EVENT_CALL_DISCONNECT_CAUSE_CHANGED = 26; // 0x1a















    field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int EVENT_CALL_FORWARDING_INDICATOR_CHANGED = 4; // 0x4















    field public static final int EVENT_CALL_STATE_CHANGED = 6; // 0x6















    field public static final int EVENT_CARRIER_NETWORK_CHANGED = 17; // 0x11













    field @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public static final int EVENT_CELL_INFO_CHANGED = 11; // 0xb













    field @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public static final int EVENT_CELL_INFO_CHANGED = 11; // 0xb















    field @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public static final int EVENT_CELL_LOCATION_CHANGED = 5; // 0x5















    field public static final int EVENT_DATA_ACTIVATION_STATE_CHANGED = 19; // 0x13















    field public static final int EVENT_DATA_ACTIVITY_CHANGED = 8; // 0x8










@@ -11792,7 +11792,7 @@ package android.telephony {













  }





























  public static interface TelephonyCallback.PhoneCapabilityListener {













    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void onPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability);













    method public void onPhoneCapabilityChanged(@NonNull android.telephony.PhoneCapability);















  }





























  public static interface TelephonyCallback.PreciseCallStateListener {

























core/java/android/telephony/PhoneStateListener.java



+47
−7






























Original line number
Diff line number
Diff line








@@ -110,6 +110,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.MessageWaitingIndicatorListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public static final int LISTEN_MESSAGE_WAITING_INDICATOR                = 0x00000004;































    /**









@@ -123,6 +124,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.CallForwardingIndicatorListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public static final int LISTEN_CALL_FORWARDING_INDICATOR                = 0x00000008;































    /**









@@ -141,6 +143,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.CellLocationListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION)















    public static final int LISTEN_CELL_LOCATION                            = 0x00000010;































    /**










@@ -194,7 +197,7 @@ public class PhoneStateListener {













     * @see #onSignalStrengthsChanged















     *















     * @hide













     * @deprecated Use {@link TelephonyCallback.AlwaysReportedSignalStrengthListener}













     * @deprecated Use TelephonyManager#setSignalStrengthUpdateRequest















     * instead.















     */















    @Deprecated









@@ -204,13 +207,18 @@ public class PhoneStateListener {













    /**















     * Listen for changes to observed cell info.















     *













     * Listening to this event requires the {@link Manifest.permission#ACCESS_FINE_LOCATION}













     * Listening to this event requires the {@link Manifest.permission#READ_PHONE_STATE} and













     * {@link Manifest.permission#ACCESS_FINE_LOCATION}















     * permission.















     *















     * @see #onCellInfoChanged















     * @deprecated Use {@link TelephonyCallback.CellInfoListener} instead.















     */















    @Deprecated













    @RequiresPermission(allOf = {













            Manifest.permission.READ_PHONE_STATE,













            Manifest.permission.ACCESS_FINE_LOCATION













    })















    public static final int LISTEN_CELL_INFO = 0x00000400;































    /**










@@ -261,7 +269,7 @@ public class PhoneStateListener {













     *















     * <p>Requires permission {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE}















     *













     * @see #onServiceStateChanged(ServiceState)













     * @see #onSrvccStateChanged















     * @hide















     * @deprecated Use {@link TelephonyCallback.SrvccStateListener} instead.















     */










@@ -376,6 +384,7 @@ public class PhoneStateListener {













     *  @deprecated Use {@link TelephonyCallback.ActiveDataSubscriptionIdListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public static final int LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE = 0x00400000;































    /**









@@ -399,6 +408,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.EmergencyNumberListListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public static final int LISTEN_EMERGENCY_NUMBER_LIST                   = 0x01000000;































    /**










@@ -487,7 +497,10 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.RegistrationFailedListener} instead.















     */















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)













    @RequiresPermission(allOf = {













            Manifest.permission.READ_PRECISE_PHONE_STATE,













            Manifest.permission.ACCESS_FINE_LOCATION













    })















    public static final int LISTEN_REGISTRATION_FAILURE = 0x40000000;































    /**









@@ -503,7 +516,10 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.BarringInfoListener} instead.















     */















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_PRECISE_PHONE_STATE)













    @RequiresPermission(allOf = {













            Manifest.permission.READ_PRECISE_PHONE_STATE,













            Manifest.permission.ACCESS_FINE_LOCATION













    })















    public static final int LISTEN_BARRING_INFO = 0x80000000;































    /*










@@ -650,6 +666,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.MessageWaitingIndicatorListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public void onMessageWaitingIndicatorChanged(boolean mwi) {















        // default implementation empty















    }









@@ -666,6 +683,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.CallForwardingIndicatorListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public void onCallForwardingIndicatorChanged(boolean cfi) {















        // default implementation empty















    }









@@ -682,6 +700,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.CellLocationListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION)















    public void onCellLocationChanged(CellLocation location) {















        // default implementation empty















    }










@@ -801,6 +820,10 @@ public class PhoneStateListener {













     * @param cellInfo is the list of currently visible cells.















     * @deprecated Use {@link TelephonyCallback.CellInfoListener} instead.















     */













    @RequiresPermission(allOf = {













            Manifest.permission.READ_PHONE_STATE,













            Manifest.permission.ACCESS_FINE_LOCATION













    })















    @Deprecated















    public void onCellInfoChanged(List<CellInfo> cellInfo) {















        // default implementation empty










@@ -875,14 +898,14 @@ public class PhoneStateListener {













     * subId. Otherwise, this callback applies to















     * {@link SubscriptionManager#getDefaultSubscriptionId()}.















     *













     * <p>Requires permission {@link android.Manifest.permission#MODIFY_PHONE_STATE}













     * <p>Requires permission {@link android.Manifest.permission#READ_PRECISE_PHONE_STATE}















     * or the calling app has carrier privileges















     * (see {@link TelephonyManager#hasCarrierPrivileges}).















     *















     * @param dataConnectionState {@link PreciseDataConnectionState}















     * @deprecated Use {@link TelephonyCallback.PreciseDataConnectionStateListener} instead.















     */













    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)













    @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE)















    @Deprecated















    public void onPreciseDataConnectionStateChanged(















            @NonNull PreciseDataConnectionState dataConnectionState) {










@@ -924,6 +947,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public void onSrvccStateChanged(@SrvccState int srvccState) {















        // default implementation empty















    }









@@ -944,6 +968,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public void onVoiceActivationStateChanged(@SimActivationState int state) {















        // default implementation empty















    }










@@ -1026,6 +1051,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.EmergencyNumberListListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public void onEmergencyNumberListChanged(















            @NonNull Map<Integer, List<EmergencyNumber>> emergencyNumberList) {















        // default implementation empty









@@ -1043,6 +1069,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)















    public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber) {















        // default implementation empty















    }









@@ -1068,6 +1095,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)















    public void onOutgoingEmergencyCall(@NonNull EmergencyNumber placedEmergencyNumber,















            int subscriptionId) {















        // Default implementation for backwards compatibility









@@ -1086,6 +1114,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)















    public void onOutgoingEmergencySms(@NonNull EmergencyNumber sentEmergencyNumber) {















        // default implementation empty















    }










@@ -1158,6 +1187,7 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.ActiveDataSubscriptionIdListener} instead.















     */















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)















    public void onActiveDataSubscriptionIdChanged(int subId) {















        // default implementation empty















    }









@@ -1178,6 +1208,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE)















    public void onCallAttributesChanged(@NonNull CallAttributes callAttributes) {















        // default implementation empty















    }









@@ -1199,6 +1230,7 @@ public class PhoneStateListener {













     */















    @SystemApi















    @Deprecated













    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)















    public void onRadioPowerStateChanged(@RadioPowerState int state) {















        // default implementation empty















    }










@@ -1253,6 +1285,10 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.RegistrationFailedListener} instead.















     */















    @Deprecated













    @RequiresPermission(allOf = {













            Manifest.permission.READ_PRECISE_PHONE_STATE,













            Manifest.permission.ACCESS_FINE_LOCATION













    })















    public void onRegistrationFailed(@NonNull CellIdentity cellIdentity, @NonNull String chosenPlmn,















            int domain, int causeCode, int additionalCauseCode) {















        // default implementation empty









@@ -1269,6 +1305,10 @@ public class PhoneStateListener {













     * @deprecated Use {@link TelephonyCallback.BarringInfoListener} instead.















     */















    @Deprecated













    @RequiresPermission(allOf = {













            Manifest.permission.READ_PRECISE_PHONE_STATE,













            Manifest.permission.ACCESS_FINE_LOCATION













    })















    public void onBarringInfoChanged(@NonNull BarringInfo barringInfo) {















        // default implementation empty















    }

































core/java/android/telephony/TelephonyCallback.java



+51
−74




























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/telephony/TelephonyRegistryManager.java



+0
−4






























Original line number
Diff line number
Diff line








@@ -894,10 +894,6 @@ public class TelephonyRegistryManager {













            eventList.add(TelephonyCallback.EVENT_SIGNAL_STRENGTHS_CHANGED);















        }





























        if (telephonyCallback instanceof TelephonyCallback.AlwaysReportedSignalStrengthListener) {













            eventList.add(TelephonyCallback.EVENT_ALWAYS_REPORTED_SIGNAL_STRENGTH_CHANGED);













        }





























        if (telephonyCallback instanceof TelephonyCallback.CellInfoListener) {















            eventList.add(TelephonyCallback.EVENT_CELL_INFO_CHANGED);















        }