Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev (2eb5a5f7) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -6362,6 +6362,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.
		*/

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -2614,6 +2614,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;

telephony/java/android/telephony/TelephonyManager.java

+0 −69

Original line number	Diff line number	Diff line
		@@ -3452,75 +3452,6 @@ public class TelephonyManager {
		return false;
		}

		/**
		* Set whether Android should display a simplified Mobile Network Settings UI
		* for the current ICCID.
		* <p>
		* 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.
		* <p>
		* 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.
		* <p>
		* 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.
		* <p>
		* 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
		*

telephony/java/com/android/internal/telephony/ITelephony.aidl

+0 −18

Original line number	Diff line number	Diff line
		@@ -726,24 +726,6 @@ interface ITelephony {
		*/
		List<String> 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