Merge "Remove settings and resources about CarrierNetworkNotifier" (21078b6b) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -10575,22 +10575,6 @@ public final class Settings {
	private static final Validator WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR =		private static final Validator WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR =
	BOOLEAN_VALIDATOR;		BOOLEAN_VALIDATOR;

	/**
	* Whether to notify the user of carrier networks.
	* <p>
	* If not connected and the scan results have a carrier network, we will
	* put this notification up. If we attempt to connect to a network or
	* the carrier network(s) disappear, we remove the notification. When we
	* show the notification, we will not show it again for
	* {@link android.provider.Settings.Global#WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY} time.
	* @hide
	*/
	public static final String WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON =
	"wifi_carrier_networks_available_notification_on";

	private static final Validator WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR =
	BOOLEAN_VALIDATOR;

	/**		/**
	* {@hide}		* {@hide}
	*/		*/
	@@ -13801,7 +13785,6 @@ public final class Settings {
	NETWORK_RECOMMENDATIONS_ENABLED,		NETWORK_RECOMMENDATIONS_ENABLED,
	WIFI_WAKEUP_ENABLED,		WIFI_WAKEUP_ENABLED,
	WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,		WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
	WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON,
	USE_OPEN_WIFI_PACKAGE,		USE_OPEN_WIFI_PACKAGE,
	WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,		WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
	EMERGENCY_TONE,		EMERGENCY_TONE,
	@@ -13870,8 +13853,6 @@ public final class Settings {
	VALIDATORS.put(PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_VALIDATOR);		VALIDATORS.put(PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_VALIDATOR);
	VALIDATORS.put(PRIVATE_DNS_SPECIFIER, PRIVATE_DNS_SPECIFIER_VALIDATOR);		VALIDATORS.put(PRIVATE_DNS_SPECIFIER, PRIVATE_DNS_SPECIFIER_VALIDATOR);
	VALIDATORS.put(SOFT_AP_TIMEOUT_ENABLED, SOFT_AP_TIMEOUT_ENABLED_VALIDATOR);		VALIDATORS.put(SOFT_AP_TIMEOUT_ENABLED, SOFT_AP_TIMEOUT_ENABLED_VALIDATOR);
	VALIDATORS.put(WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON,
	WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON_VALIDATOR);
	VALIDATORS.put(WIFI_SCAN_THROTTLE_ENABLED, WIFI_SCAN_THROTTLE_ENABLED_VALIDATOR);		VALIDATORS.put(WIFI_SCAN_THROTTLE_ENABLED, WIFI_SCAN_THROTTLE_ENABLED_VALIDATOR);
	VALIDATORS.put(APP_AUTO_RESTRICTION_ENABLED, APP_AUTO_RESTRICTION_ENABLED_VALIDATOR);		VALIDATORS.put(APP_AUTO_RESTRICTION_ENABLED, APP_AUTO_RESTRICTION_ENABLED_VALIDATOR);
	VALIDATORS.put(ZEN_DURATION, ZEN_DURATION_VALIDATOR);		VALIDATORS.put(ZEN_DURATION, ZEN_DURATION_VALIDATOR);

core/proto/android/providers/settings/global.proto

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -995,7 +995,7 @@ message GlobalSettingsProto {
	optional SettingProto display_certification_on = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto display_certification_on = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];
	optional SettingProto display_wps_config = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto display_wps_config = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];
	optional SettingProto networks_available_notification_on = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto networks_available_notification_on = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];
	optional SettingProto carrier_networks_available_notification_on = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];		reserved 7; reserved "carrier_networks_available_notification_on";
	optional SettingProto networks_available_repeat_delay = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto networks_available_repeat_delay = 8 [ (android.privacy).dest = DEST_AUTOMATIC ];
	optional SettingProto country_code = 9;		optional SettingProto country_code = 9;
	optional SettingProto framework_scan_interval_ms = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto framework_scan_interval_ms = 10 [ (android.privacy).dest = DEST_AUTOMATIC ];

core/res/res/values/strings.xml

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3377,8 +3377,6 @@

	<!-- Notification title for a nearby open wireless network.-->		<!-- Notification title for a nearby open wireless network.-->
	<string name="wifi_available_title">Connect to open Wi\u2011Fi network</string>		<string name="wifi_available_title">Connect to open Wi\u2011Fi network</string>
	<!-- Notification title for a nearby carrier wireless network.-->
	<string name="wifi_available_carrier_network_title">Connect to carrier Wi\u2011Fi network</string>
	<!-- Notification title when the system is connecting to the specified network. The network name is specified in the notification content. -->		<!-- Notification title when the system is connecting to the specified network. The network name is specified in the notification content. -->
	<string name="wifi_available_title_connecting">Connecting to Wi\u2011Fi network</string>		<string name="wifi_available_title_connecting">Connecting to Wi\u2011Fi network</string>
	<!-- Notification title when the system has connected to the network. The network name is specified in the notification content. -->		<!-- Notification title when the system has connected to the network. The network name is specified in the notification content. -->

core/res/res/values/symbols.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2070,7 +2070,6 @@
	<java-symbol type="plurals" name="wifi_available" />		<java-symbol type="plurals" name="wifi_available" />
	<java-symbol type="plurals" name="wifi_available_detailed" />		<java-symbol type="plurals" name="wifi_available_detailed" />
	<java-symbol type="string" name="wifi_available_title" />		<java-symbol type="string" name="wifi_available_title" />
	<java-symbol type="string" name="wifi_available_carrier_network_title" />
	<java-symbol type="string" name="wifi_available_title_connecting" />		<java-symbol type="string" name="wifi_available_title_connecting" />
	<java-symbol type="string" name="wifi_available_title_connected" />		<java-symbol type="string" name="wifi_available_title_connected" />
	<java-symbol type="string" name="wifi_available_title_failed_to_connect" />		<java-symbol type="string" name="wifi_available_title_failed_to_connect" />

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1537,9 +1537,6 @@ class SettingsProtoDumpUtil {
	dumpSetting(s, p,		dumpSetting(s, p,
	Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,		Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
	GlobalSettingsProto.Wifi.NETWORKS_AVAILABLE_NOTIFICATION_ON);		GlobalSettingsProto.Wifi.NETWORKS_AVAILABLE_NOTIFICATION_ON);
	dumpSetting(s, p,
	Settings.Global.WIFI_CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON,
	GlobalSettingsProto.Wifi.CARRIER_NETWORKS_AVAILABLE_NOTIFICATION_ON);
	dumpSetting(s, p,		dumpSetting(s, p,
	Settings.Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,		Settings.Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
	GlobalSettingsProto.Wifi.NETWORKS_AVAILABLE_REPEAT_DELAY);		GlobalSettingsProto.Wifi.NETWORKS_AVAILABLE_REPEAT_DELAY);