diff options
author | Derek Tan <derektan@google.com> | 2014-09-11 05:16:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 05:16:35 +0000 |
commit | 6d955b88c3df55069ada1c33dd45fc1dc3969258 (patch) | |
tree | 4f110462b53b4f009337d92da5f3e9260069252c /telephony | |
parent | 820ce63cea8b458bf96b002accab99acb2f49c0a (diff) | |
parent | 2bae510ccef2da7dd767f8148d4e3539037f4aaa (diff) | |
download | frameworks_base-6d955b88c3df55069ada1c33dd45fc1dc3969258.zip frameworks_base-6d955b88c3df55069ada1c33dd45fc1dc3969258.tar.gz frameworks_base-6d955b88c3df55069ada1c33dd45fc1dc3969258.tar.bz2 |
Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 30 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 15 |
2 files changed, 24 insertions, 21 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d53be4f..9f94040 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1738,10 +1738,10 @@ public class TelephonyManager { } /** - * Set the phone number string and its alphatag for line 1 for display - * purpose only, for example, displayed in Phone Status. It won't change - * the actual MSISDN/MDN. This setting won't be persisted during power cycle - * and it should be set again after reboot. + * Set the line 1 phone number string and its alphatag for the current ICCID + * for display purpose only, for example, displayed in Phone Status. It won't + * change the actual MSISDN/MDN. To unset alphatag or number, pass in a null + * value. * <p> * Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} @@ -1755,10 +1755,10 @@ public class TelephonyManager { } /** - * Set the phone number string and its alphatag for line 1 for display - * purpose only, for example, displayed in Phone Status. It won't change - * the actual MSISDN/MDN. This setting won't be persisted during power cycle - * and it should be set again after reboot. + * Set the line 1 phone number string and its alphatag for the current ICCID + * for display purpose only, for example, displayed in Phone Status. It won't + * change the actual MSISDN/MDN. To unset alphatag or number, pass in a null + * value. * <p> * Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} @@ -3359,8 +3359,8 @@ public class TelephonyManager { } /** - * Set whether Android should display a simplified Mobile Network Settings UI. - * The setting won't be persisted during power cycle. + * Set whether Android should display a simplified Mobile Network Settings UI + * for the current ICCID. * <p> * Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} @@ -3374,8 +3374,8 @@ public class TelephonyManager { } /** - * Set whether Android should display a simplified Mobile Network Settings UI. - * The setting won't be persisted during power cycle. + * Set whether Android should display a simplified Mobile Network Settings UI + * for the current ICCID. * <p> * Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} @@ -3394,7 +3394,8 @@ public class TelephonyManager { } /** - * Get whether a simplified Mobile Network Settings UI is enabled. + * Get whether a simplified Mobile Network Settings UI is enabled for the + * current ICCID. * <p> * Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} @@ -3407,7 +3408,8 @@ public class TelephonyManager { } /** - * Get whether a simplified Mobile Network Settings UI is enabled. + * Get whether a simplified Mobile Network Settings UI is enabled for the + * current ICCID. * <p> * Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index fa9cad4..0868f41 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -709,8 +709,8 @@ interface ITelephony { List<String> getCarrierPackageNamesForIntent(in Intent intent); /** - * Set whether Android should display a simplified Mobile Network Settings UI. - * The setting won't be persisted during power cycle. + * Set whether Android should display a simplified Mobile Network Settings UI + * for the current ICCID. * * @param subId for which the simplified UI should be enabled or disabled. * @param enable true means enabling the simplified UI. @@ -718,7 +718,8 @@ interface ITelephony { void enableSimplifiedNetworkSettingsForSubscriber(long subId, boolean enable); /** - * Get whether a simplified Mobile Network Settings UI is enabled. + * Get whether a simplified Mobile Network Settings UI is enabled for the + * current ICCID. * * @param subId for which the simplified UI should be enabled or disabled. * @return true if the simplified UI is enabled. @@ -726,10 +727,10 @@ interface ITelephony { boolean getSimplifiedNetworkSettingsEnabledForSubscriber(long subId); /** - * Set the phone number string and its alphatag for line 1 for display - * purpose only, for example, displayed in Phone Status. It won't change - * the actual MSISDN/MDN. This setting won't be persisted during power cycle - * and it should be set again after reboot. + * Set the line 1 phone number string and its alphatag for the current ICCID + * for display purpose only, for example, displayed in Phone Status. It won't + * change the actual MSISDN/MDN. To unset alphatag or number, pass in a null + * value. * * @param subId the subscriber that the alphatag and dialing number belongs to. * @param alphaTag alpha-tagging of the dailing nubmer |