diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telecomm/java/android/telecomm/PhoneAccount.java | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 27 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 6 |
4 files changed, 17 insertions, 18 deletions
diff --git a/api/current.txt b/api/current.txt index ba8551a..5c05305 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29035,7 +29035,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"; diff --git a/telecomm/java/android/telecomm/PhoneAccount.java b/telecomm/java/android/telecomm/PhoneAccount.java index d3da2ec..f709a86 100644 --- a/telecomm/java/android/telecomm/PhoneAccount.java +++ b/telecomm/java/android/telecomm/PhoneAccount.java @@ -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> * diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 164fc3c..d53be4f 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1704,7 +1704,7 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getLine1Number() { - return getLine1Number(getDefaultSubscription()); + return getLine1NumberForSubscriber(getDefaultSubscription()); } /** @@ -1717,7 +1717,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); @@ -1751,7 +1751,7 @@ public class TelephonyManager { * @param number The dialing number */ public void setLine1NumberForDisplay(String alphaTag, String number) { - setLine1NumberForDisplay(getDefaultSubscription(), alphaTag, number); + setLine1NumberForDisplayForSubscriber(getDefaultSubscription(), alphaTag, number); } /** @@ -1767,10 +1767,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) { } @@ -1786,7 +1787,7 @@ public class TelephonyManager { * nobody seems to call this. */ public String getLine1AlphaTag() { - return getLine1AlphaTag(getDefaultSubscription()); + return getLine1AlphaTagForSubscriber(getDefaultSubscription()); } /** @@ -1800,7 +1801,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); @@ -3369,7 +3370,7 @@ public class TelephonyManager { * @hide */ public void enableSimplifiedNetworkSettings(boolean enable) { - enableSimplifiedNetworkSettings(getDefaultSubscription(), enable); + enableSimplifiedNetworkSettingsForSubscriber(getDefaultSubscription(), enable); } /** @@ -3384,9 +3385,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) { } @@ -3402,7 +3403,7 @@ public class TelephonyManager { * @hide */ public boolean getSimplifiedNetworkSettingsEnabled() { - return getSimplifiedNetworkSettingsEnabled(getDefaultSubscription()); + return getSimplifiedNetworkSettingsEnabledForSubscriber(getDefaultSubscription()); } /** @@ -3415,9 +3416,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) { } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 5b280ff..fa9cad4 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -715,7 +715,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. @@ -723,7 +723,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 @@ -735,7 +735,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 |