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

am df4aee76: am 5cebc235: am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev

Browse Source 
* commit 'df4aee76cc6da4c6f9f1e3ca5153c8dbf537d1a3':
  Update the comment in two APIs since we will persist the settings.
This commit is contained in:
Derek Tan
2014-09-11 17:30:37 +00:00
committed by Android Git Automerger
parent 0eec0f7eb3 8b15e48411
commit 4e77e58cc1
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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}

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

@@ -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