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

Merge changes I7099048c,If6965979

Browse Source 
* changes:
  Expose RESULT_RECEIVER_CONTROLLER_KEY as @SystemApi.
  Make Telephony to Setting notification @SystemApi
This commit is contained in:
Xiangyu/Malcolm Chen
2020-02-11 20:59:52 +00:00
committed by Gerrit Code Review
parent e53f6ddd8f c27a3f37b1
commit fd46f62892
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/system-current.txt
View File

@@ -9780,6 +9780,12 @@ package android.telephony {
field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";
field public static final String EXTRA_DATA_SPN = "android.telephony.extra.DATA_SPN";
field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";
field public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE = "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4; // 0x4
field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1; // 0x1
field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0; // 0x0
field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3; // 0x3
field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2; // 0x2
field public static final String EXTRA_ERROR_CODE = "errorCode";
field public static final String EXTRA_PCO_ID = "pcoId";
field public static final String EXTRA_PCO_VALUE = "pcoValue";
@@ -9787,6 +9793,10 @@ package android.telephony {
field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";
field public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN";
field public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN";
field public static final String EXTRA_SIM_COMBINATION_NAMES = "android.telephony.extra.SIM_COMBINATION_NAMES";
field public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE = "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";
field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1; // 0x1
field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0; // 0x0
field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";
field public static final String EXTRA_SPN = "android.telephony.extra.SPN";
field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";
@@ -9794,6 +9804,7 @@ package android.telephony {
field public static final int INVALID_EMERGENCY_NUMBER_DB_VERSION = -1; // 0xffffffff
field public static final int KEY_TYPE_EPDG = 1; // 0x1
field public static final int KEY_TYPE_WLAN = 2; // 0x2
field public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";
field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L

18
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -51,7 +51,6 @@ import android.net.ConnectivityManager;
import android.net.NetworkStats;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.BatteryStats;
import android.os.Binder;
import android.os.Build;
import android.os.Bundle;
@@ -163,8 +162,8 @@ public class TelephonyManager {
* into the ResultReceiver Bundle.
* @hide
*/
public static final String MODEM_ACTIVITY_RESULT_KEY =
BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY;
@SystemApi
public static final String MODEM_ACTIVITY_RESULT_KEY = "controller_activity";
/**
* The process name of the Phone app as well as many other apps that use this process name, such
@@ -1418,6 +1417,7 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE =
"android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
@@ -1437,6 +1437,7 @@ public class TelephonyManager {
* to indicate there's no need to re-select any default subscription.
* @hide
*/
@SystemApi
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0;
/**
@@ -1444,6 +1445,7 @@ public class TelephonyManager {
* to indicate there's a need to select default data subscription.
* @hide
*/
@SystemApi
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1;
/**
@@ -1451,6 +1453,7 @@ public class TelephonyManager {
* to indicate there's a need to select default voice call subscription.
* @hide
*/
@SystemApi
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2;
/**
@@ -1458,6 +1461,7 @@ public class TelephonyManager {
* to indicate there's a need to select default sms subscription.
* @hide
*/
@SystemApi
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3;
/**
@@ -1467,6 +1471,7 @@ public class TelephonyManager {
* which subscription should be the default subscription.
* @hide
*/
@SystemApi
public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4;
/**
@@ -1476,6 +1481,7 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE =
"android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";
@@ -1492,6 +1498,7 @@ public class TelephonyManager {
* to indicate there's no SIM combination warning.
* @hide
*/
@SystemApi
public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0;
/**
@@ -1499,6 +1506,7 @@ public class TelephonyManager {
* to indicate two active SIMs are both CDMA hence there might be functional limitation.
* @hide
*/
@SystemApi
public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1;
/**
@@ -1509,6 +1517,7 @@ public class TelephonyManager {
*
* @hide
*/
@SystemApi
public static final String EXTRA_SIM_COMBINATION_NAMES =
"android.telephony.extra.SIM_COMBINATION_NAMES";
@@ -10048,7 +10057,8 @@ public class TelephonyManager {
* Requests the modem activity info. The recipient will place the result
* in `result`.
* @param result The object on which the recipient will send the resulting
* {@link android.telephony.ModemActivityInfo} object.
* {@link android.telephony.ModemActivityInfo} object with key of
* {@link #MODEM_ACTIVITY_RESULT_KEY}.
* @hide
*/
@SystemApi