diff options
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 8 | ||||
| -rw-r--r-- | telephony/java/android/telephony/PhoneStateListener.java | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 954ed51d5e02..d854976ac8a6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 8538c9c88647..7f89b379654c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2865,8 +2865,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 { diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index cb5d5bfab1df..103d3aee6a13 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -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; @@ -1946,7 +1946,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); @@ -1971,7 +1971,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); diff --git a/telephony/java/android/telephony/PhoneStateListener.java b/telephony/java/android/telephony/PhoneStateListener.java index 35eec6dd3cb3..6d0ed3257686 100644 --- a/telephony/java/android/telephony/PhoneStateListener.java +++ b/telephony/java/android/telephony/PhoneStateListener.java @@ -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 |