Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "new System API for sim voice activation state." am: 16533c35d3

Browse Source 
am: b332c39954

Change-Id: I18346531c31e9a8a593da18c1d07ee33f1650784
This commit is contained in:
Chen Xu
2018-11-15 09:36:07 -08:00
committed by android-build-merger
parent 9d679cc5f7 b332c39954
commit c078fd99dd
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5168,8 +5168,10 @@ package android.telephony {
public class PhoneStateListener {
method public void onRadioPowerStateChanged(int);
method public void onSrvccStateChanged(int);
method public void onVoiceActivationStateChanged(int);
field public static final int LISTEN_RADIO_POWER_STATE_CHANGED = 8388608; // 0x800000
field public static final int LISTEN_SRVCC_STATE_CHANGED = 16384; // 0x4000
field public static final int LISTEN_VOICE_ACTIVATION_STATE = 131072; // 0x20000
}
public class ServiceState implements android.os.Parcelable {

52
telephony/java/android/telephony/PhoneStateListener.java
View File

@@ -233,34 +233,35 @@ public class PhoneStateListener {
public static final int LISTEN_CARRIER_NETWORK_CHANGE = 0x00010000;
/**
* Listen for changes to the sim voice activation state
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATING
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_DEACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_RESTRICTED
* @see TelephonyManager#SIM_ACTIVATION_STATE_UNKNOWN
* {@more}
* Example: TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED indicates voice service has been
* fully activated
* Listen for changes to the sim voice activation state
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATING
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_DEACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_RESTRICTED
* @see TelephonyManager#SIM_ACTIVATION_STATE_UNKNOWN
* {@more}
* Example: TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED indicates voice service has been
* fully activated
*
* @see #onVoiceActivationStateChanged
* @hide
* @see #onVoiceActivationStateChanged
* @hide
*/
@SystemApi
public static final int LISTEN_VOICE_ACTIVATION_STATE = 0x00020000;
/**
* Listen for changes to the sim data activation state
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATING
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_DEACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_RESTRICTED
* @see TelephonyManager#SIM_ACTIVATION_STATE_UNKNOWN
* {@more}
* Example: TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED indicates data service has been
* fully activated
* Listen for changes to the sim data activation state
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATING
* @see TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_DEACTIVATED
* @see TelephonyManager#SIM_ACTIVATION_STATE_RESTRICTED
* @see TelephonyManager#SIM_ACTIVATION_STATE_UNKNOWN
* {@more}
* Example: TelephonyManager#SIM_ACTIVATION_STATE_ACTIVATED indicates data service has been
* fully activated
*
* @see #onDataActivationStateChanged
* @hide
* @see #onDataActivationStateChanged
* @hide
*/
public static final int LISTEN_DATA_ACTIVATION_STATE = 0x00040000;
@@ -569,8 +570,8 @@ public class PhoneStateListener {
* @param state is the current SIM voice activation state
* @hide
*/
public void onVoiceActivationStateChanged(int state) {
@SystemApi
public void onVoiceActivationStateChanged(@TelephonyManager.SimActivationState int state) {
}
/**
@@ -578,8 +579,7 @@ public class PhoneStateListener {
* @param state is the current SIM data activation state
* @hide
*/
public void onDataActivationStateChanged(int state) {
public void onDataActivationStateChanged(@TelephonyManager.SimActivationState int state) {
}
/**