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

Merge "Hide APIs for simplified network settings." into lmp-dev

Browse Source
This commit is contained in:
Junda Liu
2014-09-06 00:55:29 +00:00
committed by Android (Google) Code Review
parent ce78347c37 b8025f3260
commit c6bd32e94f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -29006,8 +29006,6 @@ package android.telephony {
}
public class TelephonyManager {
method public void enableSimplifiedNetworkSettings(boolean);
method public void enableSimplifiedNetworkSettings(long, boolean);
method public java.util.List<android.telephony.CellInfo> getAllCellInfo();
method public int getCallState();
method public android.telephony.CellLocation getCellLocation();
@@ -29030,8 +29028,6 @@ package android.telephony {
method public java.lang.String getSimOperatorName();
method public java.lang.String getSimSerialNumber();
method public int getSimState();
method public boolean getSimplifiedNetworkSettingsEnabled();
method public boolean getSimplifiedNetworkSettingsEnabled(long);
method public java.lang.String getSubscriberId();
method public java.lang.String getVoiceMailAlphaTag();
method public java.lang.String getVoiceMailNumber();

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

@@ -3364,6 +3364,7 @@ public class TelephonyManager {
* Or the calling app has carrier privileges. @see #hasCarrierPrivileges
*
* @param enable true means enabling the simplified UI.
* @hide
*/
public void enableSimplifiedNetworkSettings(boolean enable) {
enableSimplifiedNetworkSettings(getDefaultSubscription(), enable);
@@ -3379,6 +3380,7 @@ public class TelephonyManager {
*
* @param subId for which the simplified UI should be enabled or disabled.
* @param enable true means enabling the simplified UI.
* @hide
*/
public void enableSimplifiedNetworkSettings(long subId, boolean enable) {
try {
@@ -3395,6 +3397,7 @@ public class TelephonyManager {
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*
* @return true if the simplified UI is enabled.
* @hide
*/
public boolean getSimplifiedNetworkSettingsEnabled() {
return getSimplifiedNetworkSettingsEnabled(getDefaultSubscription());
@@ -3408,6 +3411,7 @@ public class TelephonyManager {
*
* @param subId for which the simplified UI should be enabled or disabled.
* @return true if the simplified UI is enabled.
* @hide
*/
public boolean getSimplifiedNetworkSettingsEnabled(long subId) {
try {