Merge changes from topic "adbwifi-base" (458a9a25) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -9739,10 +9739,16 @@ public final class Settings {
		private static final Validator BUGREPORT_IN_POWER_MENU_VALIDATOR = BOOLEAN_VALIDATOR;

		/**
		* Whether ADB is enabled.
		* Whether ADB over USB is enabled.
		*/
		public static final String ADB_ENABLED = "adb_enabled";

		/**
		* Whether ADB over Wifi is enabled.
		* @hide
		*/
		public static final String ADB_WIFI_ENABLED = "adb_wifi_enabled";

		/**
		* Whether Views are allowed to save their attribute data.
		* @hide

+12 −0

Original line number	Diff line number	Diff line
		@@ -2718,6 +2718,18 @@
		<string name="config_customAdbPublicKeyConfirmationSecondaryUserComponent"
		>com.android.systemui/com.android.systemui.usb.UsbDebuggingSecondaryUserActivity</string>

		<!-- Name of the activity or service that prompts the user to reject, accept, or whitelist
		a wireless network for wireless debugging.
		Can be customized for other product types -->
		<string name="config_customAdbWifiNetworkConfirmationComponent"
		>com.android.systemui/com.android.systemui.wifi.WifiDebuggingActivity</string>

		<!-- Name of the activity that prompts the secondary user to acknowledge she/he needs to
		switch to the primary user to enable wireless debugging.
		Can be customized for other product types -->
		<string name="config_customAdbWifiNetworkConfirmationSecondaryUserComponent"
		>com.android.systemui/com.android.systemui.wifi.WifiDebuggingSecondaryUserActivity</string>

		<!-- Name of the dialog that is used to request the user's consent for a Platform VPN -->
		<string name="config_platformVpnConfirmDialogComponent" translatable="false"
		>com.android.vpndialogs/com.android.vpndialogs.PlatformVpnConfirmDialog</string>

+6 −0

Original line number	Diff line number	Diff line
		@@ -3642,6 +3642,12 @@
		<!-- Message of notification shown when ADB is actively connected to the phone. -->
		<string name="adb_active_notification_message">Tap to turn off USB debugging</string>
		<string name="adb_active_notification_message" product="tv">Select to disable USB debugging.</string>
		<!-- Title of notification shown when ADB Wireless is actively connected to the phone. [CHAR LIMIT=NONE] -->
		<string name="adbwifi_active_notification_title">Wireless debugging connected</string>
		<!-- Message of notification shown when ADB Wireless is actively connected to the phone. [CHAR LIMIT=NONE] -->
		<string name="adbwifi_active_notification_message">Tap to turn off wireless debugging</string>
		<!-- Message of notification shown when ADB Wireless is actively connected to the TV. [CHAR LIMIT=NONE] -->
		<string name="adbwifi_active_notification_message" product="tv">Select to disable wireless debugging.</string>

		<!-- Title of notification shown when Test Harness Mode is enabled. [CHAR LIMIT=NONE] -->
		<string name="test_harness_mode_notification_title">Test Harness Mode enabled</string>

+4 −0

Original line number	Diff line number	Diff line
		@@ -2090,6 +2090,8 @@
		<java-symbol type="string" name="accessibility_binding_label" />
		<java-symbol type="string" name="adb_active_notification_message" />
		<java-symbol type="string" name="adb_active_notification_title" />
		<java-symbol type="string" name="adbwifi_active_notification_message" />
		<java-symbol type="string" name="adbwifi_active_notification_title" />
		<java-symbol type="string" name="test_harness_mode_notification_title" />
		<java-symbol type="string" name="test_harness_mode_notification_message" />
		<java-symbol type="string" name="taking_remote_bugreport_notification_title" />
		@@ -2232,6 +2234,8 @@
		<java-symbol type="fraction" name="config_maximumScreenDimRatio" />
		<java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" />
		<java-symbol type="string" name="config_customAdbPublicKeyConfirmationSecondaryUserComponent" />
		<java-symbol type="string" name="config_customAdbWifiNetworkConfirmationComponent" />
		<java-symbol type="string" name="config_customAdbWifiNetworkConfirmationSecondaryUserComponent" />
		<java-symbol type="string" name="config_customVpnConfirmDialogComponent" />
		<java-symbol type="string" name="config_customVpnAlwaysOnDisconnectedDialogComponent" />
		<java-symbol type="string" name="config_platformVpnConfirmDialogComponent" />

+1 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ public class SettingsBackupTest {
		Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED,
		Settings.Global.ADB_ALLOWED_CONNECTION_TIME,
		Settings.Global.ADB_ENABLED,
		Settings.Global.ADB_WIFI_ENABLED,
		Settings.Global.ADD_USERS_WHEN_LOCKED,
		Settings.Global.AIRPLANE_MODE_ON,
		Settings.Global.AIRPLANE_MODE_RADIOS,