Merge "Clear flag - emergency_callback_mode_notification" into main (9eef798c) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+11 −11

Original line number	Diff line number	Diff line
		@@ -16257,7 +16257,7 @@ package android.telephony {
		field public static final int EVENT_DATA_CONNECTION_STATE_CHANGED = 7; // 0x7
		field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int EVENT_DATA_ENABLED_CHANGED = 34; // 0x22
		field public static final int EVENT_DISPLAY_INFO_CHANGED = 21; // 0x15
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int EVENT_EMERGENCY_CALLBACK_MODE_CHANGED = 40; // 0x28
		field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final int EVENT_EMERGENCY_CALLBACK_MODE_CHANGED = 40; // 0x28
		field @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public static final int EVENT_EMERGENCY_NUMBER_LIST_CHANGED = 25; // 0x19
		field @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public static final int EVENT_IMS_CALL_DISCONNECT_CAUSE_CHANGED = 28; // 0x1c
		field @RequiresPermission(android.Manifest.permission.READ_CALL_LOG) public static final int EVENT_LEGACY_CALL_STATE_CHANGED = 36; // 0x24
		@@ -16307,7 +16307,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void onDataEnabledChanged(boolean, int);
		}

		@FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static interface TelephonyCallback.EmergencyCallbackModeListener {
		public static interface TelephonyCallback.EmergencyCallbackModeListener {
		method public void onCallbackModeRestarted(int, @NonNull java.time.Duration, int);
		method public void onCallbackModeStarted(int, @NonNull java.time.Duration, int);
		method public void onCallbackModeStopped(int, int, int);
		@@ -16586,8 +16586,8 @@ package android.telephony {
		field public static final int CELL_BROADCAST_RESULT_SUCCESS = 0; // 0x0
		field public static final int CELL_BROADCAST_RESULT_UNKNOWN = -1; // 0xffffffff
		field public static final int CELL_BROADCAST_RESULT_UNSUPPORTED = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int EMERGENCY_CALLBACK_MODE_CALL = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int EMERGENCY_CALLBACK_MODE_SMS = 2; // 0x2
		field public static final int EMERGENCY_CALLBACK_MODE_CALL = 1; // 0x1
		field public static final int EMERGENCY_CALLBACK_MODE_SMS = 2; // 0x2
		field public static final int ENABLE_NR_DUAL_CONNECTIVITY_INVALID_STATE = 4; // 0x4
		field public static final int ENABLE_NR_DUAL_CONNECTIVITY_NOT_SUPPORTED = 1; // 0x1
		field public static final int ENABLE_NR_DUAL_CONNECTIVITY_RADIO_ERROR = 3; // 0x3
		@@ -16649,13 +16649,13 @@ package android.telephony {
		field public static final int SRVCC_STATE_HANDOVER_FAILED = 2; // 0x2
		field public static final int SRVCC_STATE_HANDOVER_NONE = -1; // 0xffffffff
		field public static final int SRVCC_STATE_HANDOVER_STARTED = 0; // 0x0
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_EMERGENCY_SMS_SENT = 4; // 0x4
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_NORMAL_SMS_SENT = 2; // 0x2
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_OUTGOING_EMERGENCY_CALL_INITIATED = 3; // 0x3
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_OUTGOING_NORMAL_CALL_INITIATED = 1; // 0x1
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_TIMER_EXPIRED = 5; // 0x5
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_UNKNOWN = 0; // 0x0
		field @FlaggedApi("com.android.internal.telephony.flags.emergency_callback_mode_notification") public static final int STOP_REASON_USER_ACTION = 6; // 0x6
		field public static final int STOP_REASON_EMERGENCY_SMS_SENT = 4; // 0x4
		field public static final int STOP_REASON_NORMAL_SMS_SENT = 2; // 0x2
		field public static final int STOP_REASON_OUTGOING_EMERGENCY_CALL_INITIATED = 3; // 0x3
		field public static final int STOP_REASON_OUTGOING_NORMAL_CALL_INITIATED = 1; // 0x1
		field public static final int STOP_REASON_TIMER_EXPIRED = 5; // 0x5
		field public static final int STOP_REASON_UNKNOWN = 0; // 0x0
		field public static final int STOP_REASON_USER_ACTION = 6; // 0x6
		field public static final int THERMAL_MITIGATION_RESULT_INVALID_STATE = 3; // 0x3
		field public static final int THERMAL_MITIGATION_RESULT_MODEM_ERROR = 1; // 0x1
		field public static final int THERMAL_MITIGATION_RESULT_MODEM_NOT_AVAILABLE = 2; // 0x2

core/java/android/telephony/TelephonyCallback.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -633,8 +633,6 @@ public class TelephonyCallback {
		*
		* @hide
		*/

		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		@SystemApi
		public static final int EVENT_EMERGENCY_CALLBACK_MODE_CHANGED = 40;
		@@ -1746,7 +1744,6 @@ public class TelephonyCallback {
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public interface EmergencyCallbackModeListener {
		/**
		@@ -2284,8 +2281,6 @@ public class TelephonyCallback {
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public void onCallbackModeStarted(@TelephonyManager.EmergencyCallbackModeType int type,
		long durationMillis, int subscriptionId) {
		if (!Flags.emergencyCallbackModeNotification()) return;

		EmergencyCallbackModeListener listener =
		(EmergencyCallbackModeListener) mTelephonyCallbackWeakRef.get();
		Log.d(LOG_TAG, "onCallBackModeStarted:type=" + type + ", listener=" + listener);
		@@ -2300,8 +2295,6 @@ public class TelephonyCallback {
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public void onCallbackModeRestarted(@TelephonyManager.EmergencyCallbackModeType int type,
		long durationMillis, int subscriptionId) {
		if (!Flags.emergencyCallbackModeNotification()) return;

		EmergencyCallbackModeListener listener =
		(EmergencyCallbackModeListener) mTelephonyCallbackWeakRef.get();
		Log.d(LOG_TAG, "onCallbackModeRestarted:type=" + type + ", listener=" + listener);
		@@ -2316,8 +2309,6 @@ public class TelephonyCallback {
		@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
		public void onCallbackModeStopped(@TelephonyManager.EmergencyCallbackModeType int type,
		@TelephonyManager.EmergencyCallbackModeStopReason int reason, int subscriptionId) {
		if (!Flags.emergencyCallbackModeNotification()) return;

		EmergencyCallbackModeListener listener =
		(EmergencyCallbackModeListener) mTelephonyCallbackWeakRef.get();
		Log.d(LOG_TAG, "onCallBackModeStopped:type=" + type

telephony/java/android/telephony/TelephonyManager.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -19532,7 +19532,6 @@ public class TelephonyManager {
		* The emergency callback mode is due to emergency call.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int EMERGENCY_CALLBACK_MODE_CALL = 1;

		@@ -19540,7 +19539,6 @@ public class TelephonyManager {
		* The emergency callback mode is due to emergency SMS.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int EMERGENCY_CALLBACK_MODE_SMS = 2;

		@@ -19565,7 +19563,6 @@ public class TelephonyManager {
		* Indicates that emergency callback mode has been stopped for an unknown reason.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_UNKNOWN = 0;

		@@ -19574,7 +19571,6 @@ public class TelephonyManager {
		* initiated.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_OUTGOING_NORMAL_CALL_INITIATED = 1;

		@@ -19583,7 +19579,6 @@ public class TelephonyManager {
		* sent.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_NORMAL_SMS_SENT = 2;

		@@ -19592,7 +19587,6 @@ public class TelephonyManager {
		* call was initiated.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_OUTGOING_EMERGENCY_CALL_INITIATED = 3;

		@@ -19600,7 +19594,6 @@ public class TelephonyManager {
		* Indicates that emergency callback mode has been stopped because a new emergency SMS was sent.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_EMERGENCY_SMS_SENT = 4;

		@@ -19609,7 +19602,6 @@ public class TelephonyManager {
		* timer expiry.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_TIMER_EXPIRED = 5;

		@@ -19618,7 +19610,6 @@ public class TelephonyManager {
		* mode by clicking the notification.
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_EMERGENCY_CALLBACK_MODE_NOTIFICATION)
		@SystemApi
		public static final int STOP_REASON_USER_ACTION = 6;