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

Commit d9663766 authored by Shuo Qian's avatar Shuo Qian Committed by sqian
Browse files

Change the Listener API names 

Test: cts
Bug: 135204580
Change-Id: I1f64d6eb6b113ca85f43a3f6a578c68dbb8bd5ed
parent 7dbc7ed5

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7768,8 +7768,8 @@ package android.telephony { 
    field public static final int LISTEN_CALL_ATTRIBUTES_CHANGED = 67108864; // 0x4000000

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

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

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

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

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

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

    field @RequiresPermission("android.permission.READ_PRECISE_PHONE_STATE") public static final int LISTEN_PRECISE_CALL_STATE = 2048; // 0x800

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

    field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2864,8 +2864,8 @@ package android.telephony { 
  public class PhoneStateListener {

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

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

    field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER = 268435456; // 0x10000000

    field @RequiresPermission("android.permission.READ_ACTIVE_EMERGENCY_SESSION") public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER = 536870912; // 0x20000000

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

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

  }



  public class ServiceState implements android.os.Parcelable {

services/core/java/com/android/server/TelephonyRegistry.java

+4 −4
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE;



    static final int READ_ACTIVE_EMERGENCY_SESSION_PERMISSION_MASK =

            PhoneStateListener.LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER

                    | PhoneStateListener.LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER;

            PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL

                    | PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_SMS;



    private static final int MSG_USER_SWITCHED = 1;

    private static final int MSG_UPDATE_DEFAULT_SUB = 2;
@@ -1948,7 +1948,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                mOutgoingCallEmergencyNumber[phoneId] = emergencyNumber;

                for (Record r : mRecords) {

                    if (r.matchPhoneStateListenerEvent(

                            PhoneStateListener.LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER)

                            PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_CALL)

                                    && idMatch(r.subId, subId, phoneId)) {

                        try {

                            r.callback.onOutgoingEmergencyCall(emergencyNumber);
@@ -1973,7 +1973,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                mOutgoingSmsEmergencyNumber[phoneId] = emergencyNumber;

                for (Record r : mRecords) {

                    if (r.matchPhoneStateListenerEvent(

                            PhoneStateListener.LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER)

                            PhoneStateListener.LISTEN_OUTGOING_EMERGENCY_SMS)

                                    && idMatch(r.subId, subId, phoneId)) {

                        try {

                            r.callback.onOutgoingEmergencySms(emergencyNumber);

telephony/java/android/telephony/PhoneStateListener.java

+2 −2
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ public class PhoneStateListener { 
    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)

    public static final int LISTEN_OUTGOING_CALL_EMERGENCY_NUMBER           = 0x10000000;

    public static final int LISTEN_OUTGOING_EMERGENCY_CALL                  = 0x10000000;



    /**

     * Listen for the emergency number placed from an outgoing SMS.
@@ -387,7 +387,7 @@ public class PhoneStateListener { 
    @SystemApi

    @TestApi

    @RequiresPermission(Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION)

    public static final int LISTEN_OUTGOING_SMS_EMERGENCY_NUMBER            = 0x20000000;

    public static final int LISTEN_OUTGOING_EMERGENCY_SMS                   = 0x20000000;



    /*

     * Subscription used to listen to the phone state changes