Merge changes from topic "adbwifi-aosp" (10d71243) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -9275,10 +9275,16 @@ public final class Settings {
		public static final String CUSTOM_BUGREPORT_HANDLER_USER = "custom_bugreport_handler_user";

		/**
		* 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
		@@ -2588,6 +2588,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>

		<!-- Component name of the activity that shows the usb containment status. -->
		<string name="config_usbContaminantActivity" translatable="false"
		>com.android.systemui/com.android.systemui.usb.UsbContaminantActivity</string>

+6 −0

Original line number	Diff line number	Diff line
		@@ -3527,6 +3527,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
		@@ -2009,6 +2009,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="console_running_notification_title" />
		@@ -2154,6 +2156,8 @@
		<java-symbol type="integer" name="config_attentiveWarningDuration" />
		<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" />

+5 −0

Original line number	Diff line number	Diff line
		@@ -989,6 +989,11 @@ public class SettingsProvider extends ContentProvider {
		String value = setting != null ? setting.getValue() : null;
		updateGlobalSetting(Settings.Global.ADB_ENABLED,
		value, null, true, userId, true);

		setting = getGlobalSetting(Settings.Global.ADB_WIFI_ENABLED);
		value = setting != null ? setting.getValue() : null;
		updateGlobalSetting(Settings.Global.ADB_WIFI_ENABLED,
		value, null, true, userId, true);
		}
		} finally {
		Binder.restoreCallingIdentity(identity);