From b8025f32605d6e450d3a64381e6da4aee58e54d7 Mon Sep 17 00:00:00 2001 From: Junda Liu Date: Fri, 5 Sep 2014 16:28:40 -0700 Subject: [PATCH] Hide APIs for simplified network settings. Bug: b/17255752 Change-Id: Ibbe5d5cdbc2398ba0df2103bd7a33b98dc977734 --- api/current.txt | 4 ---- telephony/java/android/telephony/TelephonyManager.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index d132ac7b2067d..43214895f2af9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28988,8 +28988,6 @@ package android.telephony { } public class TelephonyManager { - method public void enableSimplifiedNetworkSettings(boolean); - method public void enableSimplifiedNetworkSettings(long, boolean); method public java.util.List getAllCellInfo(); method public int getCalculatedPreferredNetworkType(); method public int getCallState(); @@ -29014,8 +29012,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(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index cdee3de0e4e9d..6930036b7e2f1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3393,6 +3393,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); @@ -3408,6 +3409,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 { @@ -3424,6 +3426,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()); @@ -3437,6 +3440,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 {