diff options
author | Derek Tan <derektan@google.com> | 2014-09-05 17:16:48 -0700 |
---|---|---|
committer | Derek Tan <derektan@google.com> | 2014-09-08 10:55:29 -0700 |
commit | 2bae510ccef2da7dd767f8148d4e3539037f4aaa (patch) | |
tree | 86f7770837dc2640a5e4d0bdb83cc578f0955944 /telephony | |
parent | fdd41b3cbfc16a19c5a16ec9bd56cdd76e179fcf (diff) | |
download | frameworks_base-2bae510ccef2da7dd767f8148d4e3539037f4aaa.zip frameworks_base-2bae510ccef2da7dd767f8148d4e3539037f4aaa.tar.gz frameworks_base-2bae510ccef2da7dd767f8148d4e3539037f4aaa.tar.bz2 |
Update the comment in two APIs since we will persist the settings.
Bug: 17255752
Change-Id: I28926381e8e982579b38c19799078f7a3151aefe
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 93c49ba..cf66633 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1736,10 +1736,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} @@ -1753,10 +1753,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} @@ -3356,8 +3356,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} @@ -3371,8 +3371,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} @@ -3391,7 +3391,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} @@ -3404,7 +3405,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 79c72b88..f300dd3 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 enableSimplifiedNetworkSettings(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 getSimplifiedNetworkSettingsEnabled(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 |