diff options
| author | Junda Liu <junda@google.com> | 2014-09-06 00:55:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-06 00:55:30 +0000 |
| commit | c6bd32e94fae8dc2c394058bc840d239c3b5189b (patch) | |
| tree | 8c2d8f499e61a18c02c720cba68b31e8c436cfb5 /telephony | |
| parent | ce78347c37000347c9dbd4487d53a3f4aceff692 (diff) | |
| parent | b8025f32605d6e450d3a64381e6da4aee58e54d7 (diff) | |
| download | frameworks_base-c6bd32e94fae8dc2c394058bc840d239c3b5189b.zip frameworks_base-c6bd32e94fae8dc2c394058bc840d239c3b5189b.tar.gz frameworks_base-c6bd32e94fae8dc2c394058bc840d239c3b5189b.tar.bz2 | |
Merge "Hide APIs for simplified network settings." into lmp-dev
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 53a7a73..93c49ba 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 { |