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

Unhiding MSIM APIs.

Browse Source 
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: Ibebab7379ea79c8e4812bbd190342827048e30e2
This commit is contained in:
Shishir Agrawal
2016-01-25 13:03:07 -08:00
parent 3104d634a1
commit 7ea3e8bf89
13 changed files with 178 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api/current.txt
View File

@@ -36401,10 +36401,15 @@ package android.telephony {
method public int getActiveSubscriptionInfoCountMax();
method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
method public static int getDefaultDataSubscriptionId();
method public static int getDefaultSmsSubscriptionId();
method public static int getDefaultSubscriptionId();
method public static int getDefaultVoiceSubscriptionId();
method public boolean isNetworkRoaming(int);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff
}
public static class SubscriptionManager.OnSubscriptionsChangedListener {
@@ -36416,32 +36421,49 @@ package android.telephony {
method public boolean canChangeDtmfToneLength();
method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState();
method public int getCallState(int);
method public android.telephony.CellLocation getCellLocation();
method public int getDataActivity();
method public int getDataNetworkType(int);
method public int getDataState();
method public java.lang.String getDeviceId();
method public java.lang.String getDeviceId(int);
method public java.lang.String getDeviceSoftwareVersion();
method public java.lang.String getGroupIdLevel1();
method public java.lang.String getGroupIdLevel1(int);
method public java.lang.String getIccSimChallengeResponse(int, java.lang.String);
method public java.lang.String getLine1AlphaTag(int);
method public java.lang.String getLine1Number();
method public java.lang.String getLine1Number(int);
method public java.lang.String getMmsUAProfUrl();
method public java.lang.String getMmsUserAgent();
method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
method public java.lang.String getNetworkCountryIso();
method public java.lang.String getNetworkCountryIso(int);
method public java.lang.String getNetworkOperator();
method public java.lang.String getNetworkOperator(int);
method public java.lang.String getNetworkOperatorName();
method public java.lang.String getNetworkOperatorName(int);
method public int getNetworkType();
method public int getNetworkType(int);
method public int getPhoneCount();
method public int getPhoneType();
method public java.lang.String getSimCountryIso();
method public java.lang.String getSimCountryIso(int);
method public java.lang.String getSimOperator();
method public java.lang.String getSimOperator(int);
method public java.lang.String getSimOperatorName();
method public java.lang.String getSimOperatorName(int);
method public java.lang.String getSimSerialNumber();
method public java.lang.String getSimSerialNumber(int);
method public int getSimState();
method public java.lang.String getSubscriberId();
method public java.lang.String getSubscriberId(int);
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailAlphaTag(int);
method public java.lang.String getVoiceMailNumber();
method public java.lang.String getVoiceMailNumber(int);
method public int getVoiceNetworkType(int);
method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
method public boolean hasCarrierPrivileges();
method public boolean hasIccCard();
@@ -36452,6 +36474,7 @@ package android.telephony {
method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
method public boolean isHearingAidCompatibilitySupported();
method public boolean isNetworkRoaming();
method public boolean isNetworkRoaming(int);
method public boolean isSmsCapable();
method public boolean isTtyModeSupported();
method public boolean isVoiceCapable();
@@ -36460,9 +36483,11 @@ package android.telephony {
method public void listen(android.telephony.PhoneStateListener, int);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public boolean setLine1NumberForDisplay(int, java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
method public boolean setPreferredNetworkTypeToGlobal();
method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
method public boolean setVoiceMailNumber(int, java.lang.String, java.lang.String);
field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

25
api/system-current.txt
View File

@@ -38790,10 +38790,15 @@ package android.telephony {
method public int getActiveSubscriptionInfoCountMax();
method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
method public static int getDefaultDataSubscriptionId();
method public static int getDefaultSmsSubscriptionId();
method public static int getDefaultSubscriptionId();
method public static int getDefaultVoiceSubscriptionId();
method public boolean isNetworkRoaming(int);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff
}
public static class SubscriptionManager.OnSubscriptionsChangedListener {
@@ -38814,6 +38819,7 @@ package android.telephony {
method public boolean endCall();
method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState();
method public int getCallState(int);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);
method public java.lang.String getCdmaMdn();
@@ -38826,30 +38832,46 @@ package android.telephony {
method public int getDataActivity();
method public boolean getDataEnabled();
method public boolean getDataEnabled(int);
method public int getDataNetworkType(int);
method public int getDataState();
method public java.lang.String getDeviceId();
method public java.lang.String getDeviceId(int);
method public java.lang.String getDeviceSoftwareVersion();
method public java.lang.String getGroupIdLevel1();
method public java.lang.String getGroupIdLevel1(int);
method public java.lang.String getIccSimChallengeResponse(int, java.lang.String);
method public java.lang.String getLine1AlphaTag(int);
method public java.lang.String getLine1Number();
method public java.lang.String getLine1Number(int);
method public java.lang.String getMmsUAProfUrl();
method public java.lang.String getMmsUserAgent();
method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
method public java.lang.String getNetworkCountryIso();
method public java.lang.String getNetworkCountryIso(int);
method public java.lang.String getNetworkOperator();
method public java.lang.String getNetworkOperator(int);
method public java.lang.String getNetworkOperatorName();
method public java.lang.String getNetworkOperatorName(int);
method public int getNetworkType();
method public int getNetworkType(int);
method public int getPhoneCount();
method public int getPhoneType();
method public java.lang.String getSimCountryIso();
method public java.lang.String getSimCountryIso(int);
method public java.lang.String getSimOperator();
method public java.lang.String getSimOperator(int);
method public java.lang.String getSimOperatorName();
method public java.lang.String getSimOperatorName(int);
method public java.lang.String getSimSerialNumber();
method public java.lang.String getSimSerialNumber(int);
method public int getSimState();
method public java.lang.String getSubscriberId();
method public java.lang.String getSubscriberId(int);
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailAlphaTag(int);
method public java.lang.String getVoiceMailNumber();
method public java.lang.String getVoiceMailNumber(int);
method public int getVoiceNetworkType(int);
method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
method public boolean handlePinMmi(java.lang.String);
method public boolean handlePinMmiForSubscriber(int, java.lang.String);
@@ -38864,6 +38886,7 @@ package android.telephony {
method public boolean isHearingAidCompatibilitySupported();
method public boolean isIdle();
method public boolean isNetworkRoaming();
method public boolean isNetworkRoaming(int);
method public boolean isOffhook();
method public boolean isRadioOn();
method public boolean isRinging();
@@ -38879,11 +38902,13 @@ package android.telephony {
method public void setDataEnabled(boolean);
method public void setDataEnabled(int, boolean);
method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public boolean setLine1NumberForDisplay(int, java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
method public boolean setPreferredNetworkTypeToGlobal();
method public boolean setRadio(boolean);
method public boolean setRadioPower(boolean);
method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
method public boolean setVoiceMailNumber(int, java.lang.String, java.lang.String);
method public void silenceRinger();
method public boolean supplyPin(java.lang.String);
method public int[] supplyPinReportResult(java.lang.String);

25
api/test-current.txt
View File

@@ -36415,10 +36415,15 @@ package android.telephony {
method public int getActiveSubscriptionInfoCountMax();
method public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);
method public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();
method public static int getDefaultDataSubscriptionId();
method public static int getDefaultSmsSubscriptionId();
method public static int getDefaultSubscriptionId();
method public static int getDefaultVoiceSubscriptionId();
method public boolean isNetworkRoaming(int);
method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff
}
public static class SubscriptionManager.OnSubscriptionsChangedListener {
@@ -36430,32 +36435,49 @@ package android.telephony {
method public boolean canChangeDtmfToneLength();
method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState();
method public int getCallState(int);
method public android.telephony.CellLocation getCellLocation();
method public int getDataActivity();
method public int getDataNetworkType(int);
method public int getDataState();
method public java.lang.String getDeviceId();
method public java.lang.String getDeviceId(int);
method public java.lang.String getDeviceSoftwareVersion();
method public java.lang.String getGroupIdLevel1();
method public java.lang.String getGroupIdLevel1(int);
method public java.lang.String getIccSimChallengeResponse(int, java.lang.String);
method public java.lang.String getLine1AlphaTag(int);
method public java.lang.String getLine1Number();
method public java.lang.String getLine1Number(int);
method public java.lang.String getMmsUAProfUrl();
method public java.lang.String getMmsUserAgent();
method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
method public java.lang.String getNetworkCountryIso();
method public java.lang.String getNetworkCountryIso(int);
method public java.lang.String getNetworkOperator();
method public java.lang.String getNetworkOperator(int);
method public java.lang.String getNetworkOperatorName();
method public java.lang.String getNetworkOperatorName(int);
method public int getNetworkType();
method public int getNetworkType(int);
method public int getPhoneCount();
method public int getPhoneType();
method public java.lang.String getSimCountryIso();
method public java.lang.String getSimCountryIso(int);
method public java.lang.String getSimOperator();
method public java.lang.String getSimOperator(int);
method public java.lang.String getSimOperatorName();
method public java.lang.String getSimOperatorName(int);
method public java.lang.String getSimSerialNumber();
method public java.lang.String getSimSerialNumber(int);
method public int getSimState();
method public java.lang.String getSubscriberId();
method public java.lang.String getSubscriberId(int);
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailAlphaTag(int);
method public java.lang.String getVoiceMailNumber();
method public java.lang.String getVoiceMailNumber(int);
method public int getVoiceNetworkType(int);
method public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
method public boolean hasCarrierPrivileges();
method public boolean hasIccCard();
@@ -36466,6 +36488,7 @@ package android.telephony {
method public java.lang.String iccTransmitApduLogicalChannel(int, int, int, int, int, int, java.lang.String);
method public boolean isHearingAidCompatibilitySupported();
method public boolean isNetworkRoaming();
method public boolean isNetworkRoaming(int);
method public boolean isSmsCapable();
method public boolean isTtyModeSupported();
method public boolean isVoiceCapable();
@@ -36474,9 +36497,11 @@ package android.telephony {
method public void listen(android.telephony.PhoneStateListener, int);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public boolean setLine1NumberForDisplay(int, java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
method public boolean setPreferredNetworkTypeToGlobal();
method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
method public boolean setVoiceMailNumber(int, java.lang.String, java.lang.String);
field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

2
core/java/android/net/ConnectivityManager.java
View File

@@ -1611,7 +1611,7 @@ public class ConnectivityManager {
if (b != null) {
try {
ITelephony it = ITelephony.Stub.asInterface(b);
int subId = SubscriptionManager.getDefaultDataSubId();
int subId = SubscriptionManager.getDefaultDataSubscriptionId();
Log.d("ConnectivityManager", "getMobileDataEnabled()+ subId=" + subId);
boolean retVal = it.getDataEnabled(subId);
Log.d("ConnectivityManager", "getMobileDataEnabled()- subId=" + subId

2
packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
View File

@@ -228,7 +228,7 @@ public class DataUsageController {
private static String getActiveSubscriberId(Context context) {
final TelephonyManager tele = TelephonyManager.from(context);
final String actualSubscriberId = tele.getSubscriberId(
SubscriptionManager.getDefaultDataSubId());
SubscriptionManager.getDefaultDataSubscriptionId());
return actualSubscriberId;
}

4
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java
View File

@@ -817,11 +817,11 @@ public class NetworkControllerImpl extends BroadcastReceiver
public static class SubscriptionDefaults {
public int getDefaultVoiceSubId() {
return SubscriptionManager.getDefaultVoiceSubId();
return SubscriptionManager.getDefaultVoiceSubscriptionId();
}
public int getDefaultDataSubId() {
return SubscriptionManager.getDefaultDataSubId();
return SubscriptionManager.getDefaultDataSubscriptionId();
}
}

3
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -259,7 +259,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCHED, userHandle, 0));
} else if (action.equals(TelephonyIntents.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) {
Integer newDefaultSubIdObj = new Integer(intent.getIntExtra(
PhoneConstants.SUBSCRIPTION_KEY, SubscriptionManager.getDefaultSubId()));
PhoneConstants.SUBSCRIPTION_KEY,
SubscriptionManager.getDefaultSubscriptionId()));
int newDefaultPhoneId = intent.getIntExtra(PhoneConstants.SLOT_KEY,
SubscriptionManager.getPhoneId(mDefaultSubId));
if (DBG) {

2
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -746,7 +746,7 @@ public class CarrierConfigManager {
*/
@Nullable
public PersistableBundle getConfig() {
return getConfigForSubId(SubscriptionManager.getDefaultSubId());
return getConfigForSubId(SubscriptionManager.getDefaultSubscriptionId());
}
/**

4
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -2082,7 +2082,7 @@ public class PhoneNumberUtils
* to read the VM number.
*/
public static boolean isVoiceMailNumber(String number) {
return isVoiceMailNumber(SubscriptionManager.getDefaultSubId(), number);
return isVoiceMailNumber(SubscriptionManager.getDefaultSubscriptionId(), number);
}
/**
@@ -2977,7 +2977,7 @@ public class PhoneNumberUtils
* Returns Default voice subscription Id.
*/
private static int getDefaultVoiceSubId() {
return SubscriptionManager.getDefaultVoiceSubId();
return SubscriptionManager.getDefaultVoiceSubscriptionId();
}
//==== End of utility methods used only in compareStrictly() =====
}

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

@@ -53,7 +53,6 @@ public class SubscriptionManager {
private static final boolean VDBG = false;
/** An invalid subscription identifier */
/** @hide */
public static final int INVALID_SUBSCRIPTION_ID = -1;
/** Base value for Dummy SUBSCRIPTION_ID's. */
@@ -455,8 +454,9 @@ public class SubscriptionManager {
}
/**
* Get the active SubscriptionInfo with the subId key
* @param subId The unique SubscriptionInfo key in database
* Get the active SubscriptionInfo with the input subId.
*
* @param subId The unique SubscriptionInfo key in database.
* @return SubscriptionInfo, maybe null if its not active.
*/
public SubscriptionInfo getActiveSubscriptionInfo(int subId) {
@@ -898,12 +898,15 @@ public class SubscriptionManager {
}
/**
* @return the "system" defaultSubId on a voice capable device this
* will be getDefaultVoiceSubId() and on a data only device it will be
* getDefaultDataSubId().
* @hide
* Returns the system's default subscription id.
*
* For a voice capable device, it will return getDefaultVoiceSubscriptionId.
* For a data only device, it will return the getDefaultDataSubscriptionId.
* May return an INVALID_SUBSCRIPTION_ID on error.
*
* @return the "system" default subscription id.
*/
public static int getDefaultSubId() {
public static int getDefaultSubscriptionId() {
int subId = INVALID_SUBSCRIPTION_ID;
try {
@@ -919,8 +922,14 @@ public class SubscriptionManager {
return subId;
}
/** @hide */
public static int getDefaultVoiceSubId() {
/**
* Returns the system's default voice subscription id.
*
* On a data only device or on error, will return INVALID_SUBSCRIPTION_ID.
*
* @return the default voice subscription Id.
*/
public static int getDefaultVoiceSubscriptionId() {
int subId = INVALID_SUBSCRIPTION_ID;
try {
@@ -932,7 +941,7 @@ public class SubscriptionManager {
// ignore it
}
if (VDBG) logd("getDefaultVoiceSubId, sub id = " + subId);
if (VDBG) logd("getDefaultVoiceSubscriptionId, sub id = " + subId);
return subId;
}
@@ -949,23 +958,31 @@ public class SubscriptionManager {
}
}
/** @hide */
/**
* Return the SubscriptionInfo for default voice subscription.
*
* Will return null on data only devices, or on error.
*
* @return the SubscriptionInfo for the default voice subscription.
* @hide
*/
public SubscriptionInfo getDefaultVoiceSubscriptionInfo() {
return getActiveSubscriptionInfo(getDefaultVoiceSubId());
return getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());
}
/** @hide */
public static int getDefaultVoicePhoneId() {
return getPhoneId(getDefaultVoiceSubId());
return getPhoneId(getDefaultVoiceSubscriptionId());
}
/**
* @return subId of the DefaultSms subscription or
* a value < 0 if an error.
* Returns the system's default SMS subscription id.
*
* @hide
* On a data only device or on error, will return INVALID_SUBSCRIPTION_ID.
*
* @return the default SMS subscription Id.
*/
public static int getDefaultSmsSubId() {
public static int getDefaultSmsSubscriptionId() {
int subId = INVALID_SUBSCRIPTION_ID;
try {
@@ -977,7 +994,7 @@ public class SubscriptionManager {
// ignore it
}
if (VDBG) logd("getDefaultSmsSubId, sub id = " + subId);
if (VDBG) logd("getDefaultSmsSubscriptionId, sub id = " + subId);
return subId;
}
@@ -994,18 +1011,31 @@ public class SubscriptionManager {
}
}
/** @hide */
/**
* Return the SubscriptionInfo for default voice subscription.
*
* Will return null on data only devices, or on error.
*
* @return the SubscriptionInfo for the default SMS subscription.
* @hide
*/
public SubscriptionInfo getDefaultSmsSubscriptionInfo() {
return getActiveSubscriptionInfo(getDefaultSmsSubId());
return getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
}
/** @hide */
public int getDefaultSmsPhoneId() {
return getPhoneId(getDefaultSmsSubId());
return getPhoneId(getDefaultSmsSubscriptionId());
}
/** @hide */
public static int getDefaultDataSubId() {
/**
* Returns the system's default data subscription id.
*
* On a voice only device or on error, will return INVALID_SUBSCRIPTION_ID.
*
* @return the default data subscription Id.
*/
public static int getDefaultDataSubscriptionId() {
int subId = INVALID_SUBSCRIPTION_ID;
try {
@@ -1017,7 +1047,7 @@ public class SubscriptionManager {
// ignore it
}
if (VDBG) logd("getDefaultDataSubId, sub id = " + subId);
if (VDBG) logd("getDefaultDataSubscriptionId, sub id = " + subId);
return subId;
}
@@ -1034,14 +1064,21 @@ public class SubscriptionManager {
}
}
/** @hide */
/**
* Return the SubscriptionInfo for default data subscription.
*
* Will return null on voice only devices, or on error.
*
* @return the SubscriptionInfo for the default data subscription.
* @hide
*/
public SubscriptionInfo getDefaultDataSubscriptionInfo() {
return getActiveSubscriptionInfo(getDefaultDataSubId());
return getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
}
/** @hide */
public int getDefaultDataPhoneId() {
return getPhoneId(getDefaultDataSubId());
return getPhoneId(getDefaultDataSubscriptionId());
}
/** @hide */
@@ -1061,13 +1098,13 @@ public class SubscriptionManager {
//FIXME this is vulnerable to race conditions
/** @hide */
public boolean allDefaultsSelected() {
if (!isValidSubscriptionId(getDefaultDataSubId())) {
if (!isValidSubscriptionId(getDefaultDataSubscriptionId())) {
return false;
}
if (!isValidSubscriptionId(getDefaultSmsSubId())) {
if (!isValidSubscriptionId(getDefaultSmsSubscriptionId())) {
return false;
}
if (!isValidSubscriptionId(getDefaultVoiceSubId())) {
if (!isValidSubscriptionId(getDefaultVoiceSubscriptionId())) {
return false;
}
return true;

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

@@ -1232,7 +1232,6 @@ public class TelephonyManager {
* on a CDMA network).
* @param subId
*/
/** {@hide} */
public String getNetworkOperatorName(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_ALPHA, "");
@@ -1259,8 +1258,7 @@ public class TelephonyManager {
*
* @param subId
*/
/** {@hide} */
public String getNetworkOperatorForSubscription(int subId) {
public String getNetworkOperator(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getNetworkOperatorForPhone(phoneId);
}
@@ -1276,7 +1274,7 @@ public class TelephonyManager {
* @param phoneId
* @hide
**/
public String getNetworkOperatorForPhone(int phoneId) {
public String getNetworkOperatorForPhone(int phoneId) {
return getTelephonyProperty(phoneId, TelephonyProperties.PROPERTY_OPERATOR_NUMERIC, "");
}
@@ -1298,7 +1296,6 @@ public class TelephonyManager {
*
* @param subId
*/
/** {@hide} */
public boolean isNetworkRoaming(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return Boolean.parseBoolean(getTelephonyProperty(phoneId,
@@ -1327,8 +1324,7 @@ public class TelephonyManager {
*
* @param subId for which Network CountryIso is returned
*/
/** {@hide} */
public String getNetworkCountryIsoForSubscription(int subId) {
public String getNetworkCountryIso(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getNetworkCountryIsoForPhone(phoneId);
}
@@ -1436,7 +1432,6 @@ public class TelephonyManager {
* Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
/** {@hide} */
public int getNetworkType(int subId) {
try {
ITelephony telephony = getITelephony();
@@ -1497,7 +1492,6 @@ public class TelephonyManager {
* Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
/** {@hide} */
public int getDataNetworkType(int subId) {
try{
ITelephony telephony = getITelephony();
@@ -1535,7 +1529,6 @@ public class TelephonyManager {
* Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
/** {@hide} */
public int getVoiceNetworkType(int subId) {
try{
ITelephony telephony = getITelephony();
@@ -1804,10 +1797,9 @@ public class TelephonyManager {
* @see #getSimState
*
* @param subId for which SimOperator is returned
* @hide
*/
public String getSimOperator(int subId) {
return getSimOperatorNumericForSubscription(subId);
return getSimOperatorNumeric(subId);
}
/**
@@ -1820,17 +1812,17 @@ public class TelephonyManager {
* @hide
*/
public String getSimOperatorNumeric() {
int subId = SubscriptionManager.getDefaultDataSubId();
int subId = SubscriptionManager.getDefaultDataSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSmsSubId();
subId = SubscriptionManager.getDefaultSmsSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultVoiceSubId();
subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
if (!SubscriptionManager.isUsableSubIdValue(subId)) {
subId = SubscriptionManager.getDefaultSubId();
subId = SubscriptionManager.getDefaultSubscriptionId();
}
}
}
return getSimOperatorNumericForSubscription(subId);
return getSimOperatorNumeric(subId);
}
/**
@@ -1844,7 +1836,7 @@ public class TelephonyManager {
* @param subId for which SimOperator is returned
* @hide
*/
public String getSimOperatorNumericForSubscription(int subId) {
public String getSimOperatorNumeric(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimOperatorNumericForPhone(phoneId);
}
@@ -1881,9 +1873,8 @@ public class TelephonyManager {
* @see #getSimState
*
* @param subId for which SimOperatorName is returned
* @hide
*/
public String getSimOperatorNameForSubscription(int subId) {
public String getSimOperatorName(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimOperatorNameForPhone(phoneId);
}
@@ -1909,21 +1900,8 @@ public class TelephonyManager {
* Returns the ISO country code equivalent for the SIM provider's country code.
*
* @param subId for which SimCountryIso is returned
*
* @hide
*/
public String getSimCountryIso(int subId) {
return getSimCountryIsoForSubscription(subId);
}
/**
* Returns the ISO country code equivalent for the SIM provider's country code.
*
* @param subId for which SimCountryIso is returned
*
* @hide
*/
public String getSimCountryIsoForSubscription(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimCountryIsoForPhone(phoneId);
}
@@ -1957,7 +1935,6 @@ public class TelephonyManager {
* Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
/** {@hide} */
public String getSimSerialNumber(int subId) {
try {
IPhoneSubInfo info = getSubscriberInfo();
@@ -2046,7 +2023,6 @@ public class TelephonyManager {
*
* @param subId whose subscriber id is returned
*/
/** {@hide} */
public String getSubscriberId(int subId) {
try {
IPhoneSubInfo info = getSubscriberInfo();
@@ -2089,9 +2065,8 @@ public class TelephonyManager {
* Requires Permission:
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*
* @param subscription whose subscriber id is returned
* @param subId whose subscriber id is returned
*/
/** {@hide} */
public String getGroupIdLevel1(int subId) {
try {
IPhoneSubInfo info = getSubscriberInfo();
@@ -2118,7 +2093,7 @@ public class TelephonyManager {
* The default SMS app can also use this.
*/
public String getLine1Number() {
return getLine1NumberForSubscriber(getDefaultSubscription());
return getLine1Number(getDefaultSubscription());
}
/**
@@ -2134,8 +2109,7 @@ public class TelephonyManager {
*
* @param subId whose phone number for line 1 is returned
*/
/** {@hide} */
public String getLine1NumberForSubscriber(int subId) {
public String getLine1Number(int subId) {
String number = null;
try {
ITelephony telephony = getITelephony();
@@ -2174,7 +2148,7 @@ public class TelephonyManager {
* @return true if the operation was executed correctly.
*/
public boolean setLine1NumberForDisplay(String alphaTag, String number) {
return setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);
return setLine1NumberForDisplay(getDefaultSubscription(), alphaTag, number);
}
/**
@@ -2190,9 +2164,8 @@ public class TelephonyManager {
* @param alphaTag alpha-tagging of the dailing nubmer
* @param number The dialing number
* @return true if the operation was executed correctly.
* @hide
*/
public boolean setLine1NumberForDisplayForSubscriber(int subId, String alphaTag, String number) {
public boolean setLine1NumberForDisplay(int subId, String alphaTag, String number) {
try {
ITelephony telephony = getITelephony();
if (telephony != null)
@@ -2213,7 +2186,7 @@ public class TelephonyManager {
* nobody seems to call this.
*/
public String getLine1AlphaTag() {
return getLine1AlphaTagForSubscriber(getDefaultSubscription());
return getLine1AlphaTag(getDefaultSubscription());
}
/**
@@ -2226,8 +2199,7 @@ public class TelephonyManager {
* @param subId whose alphabetic identifier associated with line 1 is returned
* nobody seems to call this.
*/
/** {@hide} */
public String getLine1AlphaTagForSubscriber(int subId) {
public String getLine1AlphaTag(int subId) {
String alphaTag = null;
try {
ITelephony telephony = getITelephony();
@@ -2327,7 +2299,6 @@ public class TelephonyManager {
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
* @param subId whose voice mail number is returned
*/
/** {@hide} */
public String getVoiceMailNumber(int subId) {
try {
IPhoneSubInfo info = getSubscriberInfo();
@@ -2400,7 +2371,6 @@ public class TelephonyManager {
* @param alphaTag The alpha tag to display.
* @param number The voicemail number.
*/
/** {@hide} */
public boolean setVoiceMailNumber(int subId, String alphaTag, String number) {
try {
ITelephony telephony = getITelephony();
@@ -2466,7 +2436,6 @@ public class TelephonyManager {
* @param subId whose alphabetic identifier associated with the
* voice mail number is returned
*/
/** {@hide} */
public String getVoiceMailAlphaTag(int subId) {
try {
IPhoneSubInfo info = getSubscriberInfo();
@@ -2584,7 +2553,6 @@ public class TelephonyManager {
*
* @param subId whose call state is returned
*/
/** {@hide} */
public int getCallState(int subId) {
try {
ITelephony telephony = getITelephony();
@@ -3225,19 +3193,19 @@ public class TelephonyManager {
* Returns Default subscription.
*/
private static int getDefaultSubscription() {
return SubscriptionManager.getDefaultSubId();
return SubscriptionManager.getDefaultSubscriptionId();
}
/**
* Returns Default phone.
*/
private static int getDefaultPhone() {
return SubscriptionManager.getPhoneId(SubscriptionManager.getDefaultSubId());
return SubscriptionManager.getPhoneId(SubscriptionManager.getDefaultSubscriptionId());
}
/** {@hide} */
public int getDefaultSim() {
return SubscriptionManager.getSlotId(SubscriptionManager.getDefaultSubId());
return SubscriptionManager.getSlotId(SubscriptionManager.getDefaultSubscriptionId());
}
/**
@@ -4182,7 +4150,7 @@ public class TelephonyManager {
/** @hide */
@SystemApi
public void setDataEnabled(boolean enable) {
setDataEnabled(SubscriptionManager.getDefaultDataSubId(), enable);
setDataEnabled(SubscriptionManager.getDefaultDataSubscriptionId(), enable);
}
/** @hide */
@@ -4201,7 +4169,7 @@ public class TelephonyManager {
/** @hide */
@SystemApi
public boolean getDataEnabled() {
return getDataEnabled(SubscriptionManager.getDefaultDataSubId());
return getDataEnabled(SubscriptionManager.getDefaultDataSubscriptionId());
}
/** @hide */

4
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@@ -327,7 +327,7 @@ public class CallerInfo {
public static CallerInfo getCallerInfo(Context context, String number) {
if (VDBG) Rlog.v(TAG, "getCallerInfo() based on number...");
int subId = SubscriptionManager.getDefaultSubId();
int subId = SubscriptionManager.getDefaultSubscriptionId();
return getCallerInfo(context, number, subId);
}
@@ -444,7 +444,7 @@ public class CallerInfo {
// string in the phone number field.
/* package */ CallerInfo markAsVoiceMail() {
int subId = SubscriptionManager.getDefaultSubId();
int subId = SubscriptionManager.getDefaultSubscriptionId();
return markAsVoiceMail(subId);
}

2
telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
View File

@@ -387,7 +387,7 @@ public class CallerInfoAsyncQuery {
public static CallerInfoAsyncQuery startQuery(int token, Context context, String number,
OnQueryCompleteListener listener, Object cookie) {
int subId = SubscriptionManager.getDefaultSubId();
int subId = SubscriptionManager.getDefaultSubscriptionId();
return startQuery(token, context, number, listener, cookie, subId);
}