Merge "Disallow modifying USB in Settings" into sc-dev (c0c3bce1) · Commits · e / os / android_packages_apps_Settings

res/xml/development_settings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@
		android:title="@string/debug_debugging_category"
		android:order="200">

		<SwitchPreference
		<com.android.settingslib.RestrictedSwitchPreference
		android:key="enable_adb"
		android:title="@string/enable_adb"
		android:summary="@string/enable_adb_summary" />
		@@ -294,7 +294,7 @@
		android:title="@string/tethering_hardware_offload"
		android:summary="@string/tethering_hardware_offload_summary" />

		<Preference
		<com.android.settingslib.RestrictedSwitchPreference
		android:key="default_usb_configuration"
		android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment"
		android:icon="@drawable/ic_usb"
		@@ -519,7 +519,7 @@
		android:title="@string/media_category"
		android:order="800">

		<SwitchPreference
		<com.android.settingslib.RestrictedSwitchPreference
		android:key="usb_audio"
		android:title="@string/usb_audio_disable_routing"
		android:summary="@string/usb_audio_disable_routing_summary" />

res/xml/tether_prefs.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		settings:allowDividerAbove="true"
		settings:summaryLineCount="2"/>

		<SwitchPreference
		<com.android.settingslib.RestrictedSwitchPreference
		android:key="usb_tether_settings"
		android:title="@string/usb_tethering_button_text"
		android:summary="@string/usb_tethering_subtext"

src/com/android/settings/TetherSettings.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
		import static android.net.ConnectivityManager.TETHERING_USB;
		import static android.net.TetheringManager.TETHERING_ETHERNET;

		import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;

		import android.app.Activity;
		import android.app.settings.SettingsEnums;
		import android.bluetooth.BluetoothAdapter;
		@@ -38,6 +40,7 @@ import android.os.Bundle;
		import android.os.Environment;
		import android.os.Handler;
		import android.os.HandlerExecutor;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.provider.SearchIndexableResource;
		import android.text.TextUtils;
		@@ -51,6 +54,7 @@ import com.android.settings.core.FeatureFlags;
		import com.android.settings.datausage.DataSaverBackend;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.wifi.tether.WifiTetherPreferenceController;
		import com.android.settingslib.RestrictedSwitchPreference;
		import com.android.settingslib.TetherUtil;
		import com.android.settingslib.search.SearchIndexable;

		@@ -82,7 +86,7 @@ public class TetherSettings extends RestrictedSettingsFragment

		private static final String TAG = "TetheringSettings";

		private SwitchPreference mUsbTether;
		private RestrictedSwitchPreference mUsbTether;

		private SwitchPreference mBluetoothTether;

		@@ -208,7 +212,7 @@ public class TetherSettings extends RestrictedSettingsFragment

		@VisibleForTesting
		void setupTetherPreference() {
		mUsbTether = (SwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
		mUsbTether = (RestrictedSwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
		mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
		mEthernetTether = (SwitchPreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING);
		}
		@@ -415,6 +419,8 @@ public class TetherSettings extends RestrictedSettingsFragment
		mUsbTether.setEnabled(false);
		mUsbTether.setChecked(false);
		}
		mUsbTether.setDisabledByAdmin(
		checkIfUsbDataSignalingIsDisabled(getContext(), UserHandle.myUserId()));
		}

		@VisibleForTesting

src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,11 @@ import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
		import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
		import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;

		import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;

		import android.content.Context;
		import android.hardware.usb.UsbManager;
		import android.os.UserHandle;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		@@ -30,6 +33,7 @@ import com.android.settings.connecteddevice.DevicePreferenceCallback;
		import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settingslib.RestrictedPreference;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		/**
		@@ -45,7 +49,7 @@ public class ConnectedUsbDeviceUpdater {
		private UsbBackend mUsbBackend;
		private DevicePreferenceCallback mDevicePreferenceCallback;
		@VisibleForTesting
		Preference mUsbPreference;
		RestrictedPreference mUsbPreference;
		@VisibleForTesting
		UsbConnectionBroadcastReceiver mUsbReceiver;

		@@ -88,10 +92,12 @@ public class ConnectedUsbDeviceUpdater {
		}

		public void initUsbPreference(Context context) {
		mUsbPreference = new Preference(context, null /* AttributeSet */);
		mUsbPreference = new RestrictedPreference(context, null /* AttributeSet */);
		mUsbPreference.setTitle(R.string.usb_pref);
		mUsbPreference.setIcon(R.drawable.ic_usb);
		mUsbPreference.setKey(PREF_KEY);
		mUsbPreference.setDisabledByAdmin(
		checkIfUsbDataSignalingIsDisabled(context, UserHandle.myUserId()));
		mUsbPreference.setOnPreferenceClickListener((Preference p) -> {
		mMetricsFeatureProvider.logClickedPreference(p, mFragment.getMetricsCategory());
		// New version - uses a separate screen.

src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -16,9 +16,12 @@

		package com.android.settings.connecteddevice.usb;

		import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;

		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.os.Bundle;
		import android.os.UserHandle;
		import android.view.View;

		import androidx.annotation.VisibleForTesting;
		@@ -101,6 +104,11 @@ public class UsbDetailsFragment extends DashboardFragment {
		*/
		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.usb_details_fragment) {
		@Override
		protected boolean isPageSearchEnabled(Context context) {
		return checkIfUsbDataSignalingIsDisabled(
		context, UserHandle.myUserId()) != null;
		}

		@Override
		public List<AbstractPreferenceController> createPreferenceControllers(