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

am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.

Browse Source 
* commit 'bdf9cf904c5f7c61c1d77ba4261238fdbb9b08d8':
  Add ForSubscriber suffix to APIs w/ subId argument.
This commit is contained in:
Junda Liu
2014-09-10 01:00:59 +00:00
committed by Android Git Automerger
parent bb5bde9388 13e28bb938
commit 7100d15a99
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -29075,7 +29075,6 @@ package android.telephony {
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public boolean setGlobalPreferredNetworkType();
method public void setLine1NumberForDisplay(java.lang.String, java.lang.String);
method public void setLine1NumberForDisplay(long, java.lang.String, java.lang.String);
method public boolean setOperatorBrandOverride(java.lang.String);
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";

1
telecomm/java/android/telecomm/PhoneAccount.java
View File

@@ -246,7 +246,6 @@ public class PhoneAccount implements Parcelable {
* {@link #getAddress()}. For the majority of {@code PhoneAccount}s this should be registered
* as {@code null}. It is used by the system for SIM-based {@code PhoneAccount} registration
* where {@link android.telephony.TelephonyManager#setLine1NumberForDisplay(String, String)}
* or {@link android.telephony.TelephonyManager#setLine1NumberForDisplay(long, String, String)}
* has been used to alter the callback number.
* <p>
*

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

@@ -1727,7 +1727,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/
public String getLine1Number() {
return getLine1Number(getDefaultSubscription());
return getLine1NumberForSubscriber(getDefaultSubscription());
}
/**
@@ -1740,7 +1740,7 @@ public class TelephonyManager {
* @param subId whose phone number for line 1 is returned
*/
/** {@hide} */
public String getLine1Number(long subId) {
public String getLine1NumberForSubscriber(long subId) {
String number = null;
try {
number = getITelephony().getLine1NumberForDisplay(subId);
@@ -1774,7 +1774,7 @@ public class TelephonyManager {
* @param number The dialing number
*/
public void setLine1NumberForDisplay(String alphaTag, String number) {
setLine1NumberForDisplay(getDefaultSubscription(), alphaTag, number);
setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number);
}
/**
@@ -1790,10 +1790,11 @@ public class TelephonyManager {
* @param subId the subscriber that the alphatag and dialing number belongs to.
* @param alphaTag alpha-tagging of the dailing nubmer
* @param number The dialing number
* @hide
*/
public void setLine1NumberForDisplay(long subId, String alphaTag, String number) {
public void setLine1NumberForDisplayForSubscriber(long subId, String alphaTag, String number) {
try {
getITelephony().setLine1NumberForDisplay(subId, alphaTag, number);
getITelephony().setLine1NumberForDisplayForSubscriber(subId, alphaTag, number);
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
@@ -1809,7 +1810,7 @@ public class TelephonyManager {
* nobody seems to call this.
*/
public String getLine1AlphaTag() {
return getLine1AlphaTag(getDefaultSubscription());
return getLine1AlphaTagForSubscriber(getDefaultSubscription());
}
/**
@@ -1823,7 +1824,7 @@ public class TelephonyManager {
* nobody seems to call this.
*/
/** {@hide} */
public String getLine1AlphaTag(long subId) {
public String getLine1AlphaTagForSubscriber(long subId) {
String alphaTag = null;
try {
alphaTag = getITelephony().getLine1AlphaTagForDisplay(subId);
@@ -3416,7 +3417,7 @@ public class TelephonyManager {
* @hide
*/
public void enableSimplifiedNetworkSettings(boolean enable) {
enableSimplifiedNetworkSettings(getDefaultSubscription(), enable);
enableSimplifiedNetworkSettingsForSubscriber(getDefaultSubscription(), enable);
}
/**
@@ -3431,9 +3432,9 @@ public class TelephonyManager {
* @param enable true means enabling the simplified UI.
* @hide
*/
public void enableSimplifiedNetworkSettings(long subId, boolean enable) {
public void enableSimplifiedNetworkSettingsForSubscriber(long subId, boolean enable) {
try {
getITelephony().enableSimplifiedNetworkSettings(subId, enable);
getITelephony().enableSimplifiedNetworkSettingsForSubscriber(subId, enable);
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}
@@ -3449,7 +3450,7 @@ public class TelephonyManager {
* @hide
*/
public boolean getSimplifiedNetworkSettingsEnabled() {
return getSimplifiedNetworkSettingsEnabled(getDefaultSubscription());
return getSimplifiedNetworkSettingsEnabledForSubscriber(getDefaultSubscription());
}
/**
@@ -3462,9 +3463,9 @@ public class TelephonyManager {
* @return true if the simplified UI is enabled.
* @hide
*/
public boolean getSimplifiedNetworkSettingsEnabled(long subId) {
public boolean getSimplifiedNetworkSettingsEnabledForSubscriber(long subId) {
try {
return getITelephony().getSimplifiedNetworkSettingsEnabled(subId);
return getITelephony().getSimplifiedNetworkSettingsEnabledForSubscriber(subId);
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
}

6
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -732,7 +732,7 @@ interface ITelephony {
* @param subId for which the simplified UI should be enabled or disabled.
* @param enable true means enabling the simplified UI.
*/
void enableSimplifiedNetworkSettings(long subId, boolean enable);
void enableSimplifiedNetworkSettingsForSubscriber(long subId, boolean enable);
/**
* Get whether a simplified Mobile Network Settings UI is enabled.
@@ -740,7 +740,7 @@ interface ITelephony {
* @param subId for which the simplified UI should be enabled or disabled.
* @return true if the simplified UI is enabled.
*/
boolean getSimplifiedNetworkSettingsEnabled(long subId);
boolean getSimplifiedNetworkSettingsEnabledForSubscriber(long subId);
/**
* Set the phone number string and its alphatag for line 1 for display
@@ -752,7 +752,7 @@ interface ITelephony {
* @param alphaTag alpha-tagging of the dailing nubmer
* @param number The dialing number
*/
void setLine1NumberForDisplay(long subId, String alphaTag, String number);
void setLine1NumberForDisplayForSubscriber(long subId, String alphaTag, String number);
/**
* Returns the displayed dialing number string if it was set previously via