From bbdc1c0e044a505d5a200963319a683e4ef1f967 Mon Sep 17 00:00:00 2001 From: Junda Liu Date: Fri, 7 Nov 2014 11:18:02 -0800 Subject: [PATCH] Add HIDE_CARRIER_NETWORK_SETTINGS global setting. Also remove hidden APIs to get/set the preference. Bug: b/17673255 Change-Id: I8957b0380bf617c953f6665cbfdcc77c3be78411 --- core/java/android/provider/Settings.java | 8 +++ .../providers/settings/DatabaseHelper.java | 3 + .../android/telephony/TelephonyManager.java | 69 ------------------- .../internal/telephony/ITelephony.aidl | 18 ----- 4 files changed, 11 insertions(+), 87 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index a1652797a8426..4eeb8524b606d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6368,6 +6368,14 @@ public final class Settings { public static final String PREFERRED_NETWORK_MODE = "preferred_network_mode"; + /** + * Setting to 1 will hide carrier network settings. + * Default is 0. + * @hide + */ + public static final String HIDE_CARRIER_NETWORK_SETTINGS = + "hide_carrier_network_settings"; + /** * Name of an application package to be debugged. */ diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index eea97eac5c2fa..5cb230699a745 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2584,6 +2584,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { // Set default cdma call auto retry loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0); + // Set default simplified carrier network settings to 0 + loadSetting(stmt, Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0); + // Set the preferred network mode to target desired value or Default // value defined in RILConstants int type; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index a3546ed16c458..f62d822ce190d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3441,75 +3441,6 @@ public class TelephonyManager { return false; } - /** - * Set whether Android should display a simplified Mobile Network Settings UI - * for the current ICCID. - *

- * Requires Permission: - * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} - * Or the calling app has carrier privileges. @see #hasCarrierPrivileges - * - * @param enable true means enabling the simplified UI. - * @hide - */ - public void enableSimplifiedNetworkSettings(boolean enable) { - enableSimplifiedNetworkSettingsForSubscriber(getDefaultSubscription(), enable); - } - - /** - * Set whether Android should display a simplified Mobile Network Settings UI - * for the current ICCID. - *

- * Requires Permission: - * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} - * Or the calling app has carrier privileges. @see #hasCarrierPrivileges - * - * @param subId for which the simplified UI should be enabled or disabled. - * @param enable true means enabling the simplified UI. - * @hide - */ - public void enableSimplifiedNetworkSettingsForSubscriber(int subId, boolean enable) { - try { - getITelephony().enableSimplifiedNetworkSettingsForSubscriber(subId, enable); - } catch (RemoteException ex) { - } catch (NullPointerException ex) { - } - } - - /** - * Get whether a simplified Mobile Network Settings UI is enabled for the - * current ICCID. - *

- * Requires Permission: - * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} - * - * @return true if the simplified UI is enabled. - * @hide - */ - public boolean getSimplifiedNetworkSettingsEnabled() { - return getSimplifiedNetworkSettingsEnabledForSubscriber(getDefaultSubscription()); - } - - /** - * Get whether a simplified Mobile Network Settings UI is enabled for the - * current ICCID. - *

- * Requires Permission: - * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} - * - * @param subId for which the simplified UI should be enabled or disabled. - * @return true if the simplified UI is enabled. - * @hide - */ - public boolean getSimplifiedNetworkSettingsEnabledForSubscriber(int subId) { - try { - return getITelephony().getSimplifiedNetworkSettingsEnabledForSubscriber(subId); - } catch (RemoteException ex) { - } catch (NullPointerException ex) { - } - return false; - } - /** * Returns the result and response from RIL for oem request * diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 13f0e3f32b232..c50261d3d8490 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -726,24 +726,6 @@ interface ITelephony { */ List getCarrierPackageNamesForIntent(in Intent intent); - /** - * 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. - */ - void enableSimplifiedNetworkSettingsForSubscriber(int subId, boolean enable); - - /** - * 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. - */ - boolean getSimplifiedNetworkSettingsEnabledForSubscriber(int subId); - /** * 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