diff options
| author | Junda Liu <junda@google.com> | 2014-09-06 02:58:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-06 02:58:04 +0000 |
| commit | 077ffae681d3af4c59a085b56556f619ea6d9238 (patch) | |
| tree | 5f203a5d79a0851ed71938cdcd7117f41b1f415e /telephony | |
| parent | 2db9677866669d9d439fca71a1e97a198c96cc6f (diff) | |
| parent | c6bd32e94fae8dc2c394058bc840d239c3b5189b (diff) | |
| download | frameworks_base-077ffae681d3af4c59a085b56556f619ea6d9238.zip frameworks_base-077ffae681d3af4c59a085b56556f619ea6d9238.tar.gz frameworks_base-077ffae681d3af4c59a085b56556f619ea6d9238.tar.bz2 | |
am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-dev
* commit '8e250c572a6d56ba6b3645faa5b32edf1e795442':
Hide APIs for simplified network settings.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 0cce77c..e14fb81 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3411,6 +3411,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); @@ -3426,6 +3427,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 { @@ -3442,6 +3444,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()); @@ -3455,6 +3458,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 { |