From 7c5e8239655cb215f80779d1ce15eb0b8fbb8904 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Tue, 21 Jan 2020 13:40:15 -0800 Subject: [PATCH 1/2] Make Telephony to Setting notification @SystemApi They are intents and extras used by Setting to monitor certain SIM change and to pop up dialogs to users. Bug: 148097978 Test: build Change-Id: If6965979b5ab15b53f8e81cad895cc2d3dc29e0e Merged-In: If6965979b5ab15b53f8e81cad895cc2d3dc29e0e --- api/system-current.txt | 10 ++++++++++ telephony/java/android/telephony/TelephonyManager.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/api/system-current.txt b/api/system-current.txt index b7d0e5ff3b943..f69a99eafb9e5 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9709,6 +9709,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"; @@ -9716,6 +9722,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"; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ffa08107f5ae4..d5eb547958e02 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1418,6 +1418,7 @@ public class TelephonyManager { * * @hide */ + @SystemApi public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE = "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE"; @@ -1437,6 +1438,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 +1446,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 +1454,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 +1462,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 +1472,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 +1482,7 @@ public class TelephonyManager { * * @hide */ + @SystemApi public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE = "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE"; @@ -1492,6 +1499,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 +1507,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 +1518,7 @@ public class TelephonyManager { * * @hide */ + @SystemApi public static final String EXTRA_SIM_COMBINATION_NAMES = "android.telephony.extra.SIM_COMBINATION_NAMES"; From c27a3f37b1477afb73ce0412434547cfcf7bb334 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Tue, 21 Jan 2020 19:40:34 -0800 Subject: [PATCH 2/2] Expose RESULT_RECEIVER_CONTROLLER_KEY as @SystemApi. It's used by a @SystemApi as key of it's return bundule. So we should expose it. Also it's currently linked to BatteryStats. RESULT_RECEIVER_CONTROLLER_KEY which makes no sense as they are functionally independent and BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY is @hide. So also make it a hardcoded String. Bug: 148116922 Test: build Change-Id: I7099048c126e88f75cf5bd7e779ddfe923cc1c02 Merged-In: I7099048c126e88f75cf5bd7e779ddfe923cc1c02 --- api/system-current.txt | 1 + telephony/java/android/telephony/TelephonyManager.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index f69a99eafb9e5..0551c6c37be47 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9733,6 +9733,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 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d5eb547958e02..6908ab8de4036 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 @@ -10058,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