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

Merge "Revert "Revert "Telephony light grey list clean up for Q"""

Browse Source 
am: d4e2c6cd5a

Change-Id: Ibf189b80ac8d2c86872642f4a9794d0daa1a6dd7
This commit is contained in:
Chen Xu
2018-10-29 11:44:38 -07:00
committed by android-build-merger
parent 748b449887 d4e2c6cd5a
commit 39cc174191
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -676,7 +676,7 @@ public class TelecomManager {
/** /**
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static TelecomManager from(Context context) { public static TelecomManager from(Context context) {
return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
} }

14
telephony/java/android/telephony/ServiceState.java
View File

@@ -247,7 +247,7 @@ public class ServiceState implements Parcelable {
private String mDataOperatorAlphaLong; private String mDataOperatorAlphaLong;
private String mDataOperatorAlphaShort; private String mDataOperatorAlphaShort;
private String mDataOperatorNumeric; private String mDataOperatorNumeric;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
private boolean mIsManualNetworkSelection; private boolean mIsManualNetworkSelection;
private boolean mIsEmergencyOnly; private boolean mIsEmergencyOnly;
@@ -266,9 +266,9 @@ public class ServiceState implements Parcelable {
@UnsupportedAppUsage @UnsupportedAppUsage
private boolean mCssIndicator; private boolean mCssIndicator;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
private int mNetworkId; private int mNetworkId;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
private int mSystemId; private int mSystemId;
@UnsupportedAppUsage @UnsupportedAppUsage
private int mCdmaRoamingIndicator; private int mCdmaRoamingIndicator;
@@ -466,7 +466,7 @@ public class ServiceState implements Parcelable {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public int getVoiceRegState() { public int getVoiceRegState() {
return mVoiceRegState; return mVoiceRegState;
} }
@@ -481,7 +481,7 @@ public class ServiceState implements Parcelable {
* *
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public int getDataRegState() { public int getDataRegState() {
return mDataRegState; return mDataRegState;
} }
@@ -542,7 +542,7 @@ public class ServiceState implements Parcelable {
* @return roaming status * @return roaming status
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public boolean getVoiceRoaming() { public boolean getVoiceRoaming() {
return getVoiceRoamingType() != ROAMING_TYPE_NOT_ROAMING; return getVoiceRoamingType() != ROAMING_TYPE_NOT_ROAMING;
} }
@@ -566,7 +566,7 @@ public class ServiceState implements Parcelable {
* @return roaming type * @return roaming type
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public boolean getDataRoaming() { public boolean getDataRoaming() {
return getDataRoamingType() != ROAMING_TYPE_NOT_ROAMING; return getDataRoamingType() != ROAMING_TYPE_NOT_ROAMING;
} }

6
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1369,7 +1369,7 @@ public class SubscriptionManager {
} }
/** @hide */ /** @hide */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static int getPhoneId(int subId) { public static int getPhoneId(int subId) {
if (!isValidSubscriptionId(subId)) { if (!isValidSubscriptionId(subId)) {
if (DBG) { if (DBG) {
@@ -1665,7 +1665,7 @@ public class SubscriptionManager {
* usable subId means its neither a INVALID_SUBSCRIPTION_ID nor a DEFAULT_SUB_ID. * usable subId means its neither a INVALID_SUBSCRIPTION_ID nor a DEFAULT_SUB_ID.
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static boolean isUsableSubIdValue(int subId) { public static boolean isUsableSubIdValue(int subId) {
return subId >= MIN_SUBSCRIPTION_ID_VALUE && subId <= MAX_SUBSCRIPTION_ID_VALUE; return subId >= MIN_SUBSCRIPTION_ID_VALUE && subId <= MAX_SUBSCRIPTION_ID_VALUE;
} }
@@ -1683,7 +1683,7 @@ public class SubscriptionManager {
} }
/** @hide */ /** @hide */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) { public static void putPhoneIdAndSubIdExtra(Intent intent, int phoneId) {
int[] subIds = SubscriptionManager.getSubId(phoneId); int[] subIds = SubscriptionManager.getSubId(phoneId);
if (subIds != null && subIds.length > 0) { if (subIds != null && subIds.length > 0) {

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

@@ -232,7 +232,8 @@ public class TelephonyManager {
/** @hide /** @hide
/* @deprecated - use getSystemService as described above */ /* @deprecated - use getSystemService as described above */
@UnsupportedAppUsage @Deprecated
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static TelephonyManager getDefault() { public static TelephonyManager getDefault() {
return sInstance; return sInstance;
} }
@@ -321,7 +322,7 @@ public class TelephonyManager {
} }
/** {@hide} */ /** {@hide} */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public static TelephonyManager from(Context context) { public static TelephonyManager from(Context context) {
return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); return (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
} }
@@ -1890,7 +1891,7 @@ public class TelephonyManager {
* @param subId * @param subId
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getNetworkOperatorName(int subId) { public String getNetworkOperatorName(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, ""); return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, "");
@@ -1918,7 +1919,7 @@ public class TelephonyManager {
* @param subId * @param subId
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getNetworkOperator(int subId) { public String getNetworkOperator(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getNetworkOperatorForPhone(phoneId); return getNetworkOperatorForPhone(phoneId);
@@ -2242,7 +2243,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public int getDataNetworkType(int subId) { public int getDataNetworkType(int subId) {
try{ try{
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
@@ -2278,7 +2279,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public int getVoiceNetworkType(int subId) { public int getVoiceNetworkType(int subId) {
try{ try{
ITelephony telephony = getITelephony(); ITelephony telephony = getITelephony();
@@ -2761,7 +2762,7 @@ public class TelephonyManager {
* @param subId for which SimOperator is returned * @param subId for which SimOperator is returned
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimOperator(int subId) { public String getSimOperator(int subId) {
return getSimOperatorNumeric(subId); return getSimOperatorNumeric(subId);
} }
@@ -2775,7 +2776,7 @@ public class TelephonyManager {
* @see #getSimState * @see #getSimState
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimOperatorNumeric() { public String getSimOperatorNumeric() {
int subId = mSubId; int subId = mSubId;
if (!SubscriptionManager.isUsableSubIdValue(subId)) { if (!SubscriptionManager.isUsableSubIdValue(subId)) {
@@ -2804,7 +2805,7 @@ public class TelephonyManager {
* @param subId for which SimOperator is returned * @param subId for which SimOperator is returned
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimOperatorNumeric(int subId) { public String getSimOperatorNumeric(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimOperatorNumericForPhone(phoneId); return getSimOperatorNumericForPhone(phoneId);
@@ -2818,7 +2819,7 @@ public class TelephonyManager {
* @param phoneId for which SimOperator is returned * @param phoneId for which SimOperator is returned
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimOperatorNumericForPhone(int phoneId) { public String getSimOperatorNumericForPhone(int phoneId) {
return getTelephonyProperty(phoneId, return getTelephonyProperty(phoneId,
TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, ""); TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC, "");
@@ -2845,7 +2846,7 @@ public class TelephonyManager {
* @param subId for which SimOperatorName is returned * @param subId for which SimOperatorName is returned
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimOperatorName(int subId) { public String getSimOperatorName(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimOperatorNameForPhone(phoneId); return getSimOperatorNameForPhone(phoneId);
@@ -2875,7 +2876,7 @@ public class TelephonyManager {
* @param subId for which SimCountryIso is returned * @param subId for which SimCountryIso is returned
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimCountryIso(int subId) { public String getSimCountryIso(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId); int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimCountryIsoForPhone(phoneId); return getSimCountryIsoForPhone(phoneId);
@@ -3065,7 +3066,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSubscriberId(int subId) { public String getSubscriberId(int subId) {
try { try {
IPhoneSubInfo info = getSubscriberInfo(); IPhoneSubInfo info = getSubscriberInfo();
@@ -3450,7 +3451,7 @@ public class TelephonyManager {
* @hide * @hide
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getMsisdn(int subId) { public String getMsisdn(int subId) {
try { try {
IPhoneSubInfo info = getSubscriberInfo(); IPhoneSubInfo info = getSubscriberInfo();
@@ -4416,7 +4417,7 @@ public class TelephonyManager {
/** /**
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
private ITelephony getITelephony() { private ITelephony getITelephony() {
return ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE)); return ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE));
} }
@@ -8000,7 +8001,7 @@ public class TelephonyManager {
* either READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE to retrieve the information. * either READ_PRIVILEGED_PHONE_STATE or READ_PHONE_STATE to retrieve the information.
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public ServiceState getServiceStateForSubscriber(int subId) { public ServiceState getServiceStateForSubscriber(int subId) {
try { try {
ITelephony service = getITelephony(); ITelephony service = getITelephony();