Disallow modifying USB in Settings
Background * The admin can disable signaling over USB on corporate owned device. Changes * If the admin has disabled signaling over USB, disable preferences in Settings to modify USB. * Show policy transparency dialogs. Manual Testing: * Install TestDPC * Set up as Device Owner * Disable USB data signaling * Verify Settings > Connected Devices > USB is disabled * Verify Settings > Network & Internet > Hotspot & tethering > USB tethering is disabled * Verify Developer options > USB debugging, default USB configurations and USB audio routing are disabled Bug: 168301639 Test: Manual Testing make RunSettingsRoboTests -j ROBOTEST_FILTER=TetherSettingsTest make RunSettingsRoboTests -j ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest make RunSettingsRoboTests -j ROBOTEST_FILTER=UsbDefaultFragmentTest make RunSettingsRoboTests -j ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest make RunSettingsLibRoboTests -j ROBOTEST_FILTER=EnableAdbPreferenceControllerTest Change-Id: I3e8461ac37f406a407c874598335cde28fb89b2d Merged-In: I3e8461ac37f406a407c874598335cde28fb89b2d
This commit is contained in:
@@ -135,7 +135,7 @@
|
|||||||
android:title="@string/debug_debugging_category"
|
android:title="@string/debug_debugging_category"
|
||||||
android:order="200">
|
android:order="200">
|
||||||
|
|
||||||
<SwitchPreference
|
<com.android.settingslib.RestrictedSwitchPreference
|
||||||
android:key="enable_adb"
|
android:key="enable_adb"
|
||||||
android:title="@string/enable_adb"
|
android:title="@string/enable_adb"
|
||||||
android:summary="@string/enable_adb_summary" />
|
android:summary="@string/enable_adb_summary" />
|
||||||
@@ -294,7 +294,7 @@
|
|||||||
android:title="@string/tethering_hardware_offload"
|
android:title="@string/tethering_hardware_offload"
|
||||||
android:summary="@string/tethering_hardware_offload_summary" />
|
android:summary="@string/tethering_hardware_offload_summary" />
|
||||||
|
|
||||||
<Preference
|
<com.android.settingslib.RestrictedSwitchPreference
|
||||||
android:key="default_usb_configuration"
|
android:key="default_usb_configuration"
|
||||||
android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment"
|
android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment"
|
||||||
android:icon="@drawable/ic_usb"
|
android:icon="@drawable/ic_usb"
|
||||||
@@ -519,7 +519,7 @@
|
|||||||
android:title="@string/media_category"
|
android:title="@string/media_category"
|
||||||
android:order="800">
|
android:order="800">
|
||||||
|
|
||||||
<SwitchPreference
|
<com.android.settingslib.RestrictedSwitchPreference
|
||||||
android:key="usb_audio"
|
android:key="usb_audio"
|
||||||
android:title="@string/usb_audio_disable_routing"
|
android:title="@string/usb_audio_disable_routing"
|
||||||
android:summary="@string/usb_audio_disable_routing_summary" />
|
android:summary="@string/usb_audio_disable_routing_summary" />
|
||||||
|
@@ -31,7 +31,7 @@
|
|||||||
settings:allowDividerAbove="true"
|
settings:allowDividerAbove="true"
|
||||||
settings:summaryLineCount="2"/>
|
settings:summaryLineCount="2"/>
|
||||||
|
|
||||||
<SwitchPreference
|
<com.android.settingslib.RestrictedSwitchPreference
|
||||||
android:key="usb_tether_settings"
|
android:key="usb_tether_settings"
|
||||||
android:title="@string/usb_tethering_button_text"
|
android:title="@string/usb_tethering_button_text"
|
||||||
android:summary="@string/usb_tethering_subtext"
|
android:summary="@string/usb_tethering_subtext"
|
||||||
|
@@ -20,6 +20,8 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
|
|||||||
import static android.net.ConnectivityManager.TETHERING_USB;
|
import static android.net.ConnectivityManager.TETHERING_USB;
|
||||||
import static android.net.TetheringManager.TETHERING_ETHERNET;
|
import static android.net.TetheringManager.TETHERING_ETHERNET;
|
||||||
|
|
||||||
|
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.settings.SettingsEnums;
|
import android.app.settings.SettingsEnums;
|
||||||
import android.bluetooth.BluetoothAdapter;
|
import android.bluetooth.BluetoothAdapter;
|
||||||
@@ -38,6 +40,7 @@ import android.os.Bundle;
|
|||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import android.os.HandlerExecutor;
|
import android.os.HandlerExecutor;
|
||||||
|
import android.os.UserHandle;
|
||||||
import android.os.UserManager;
|
import android.os.UserManager;
|
||||||
import android.provider.SearchIndexableResource;
|
import android.provider.SearchIndexableResource;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
@@ -51,6 +54,7 @@ import com.android.settings.core.FeatureFlags;
|
|||||||
import com.android.settings.datausage.DataSaverBackend;
|
import com.android.settings.datausage.DataSaverBackend;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.wifi.tether.WifiTetherPreferenceController;
|
import com.android.settings.wifi.tether.WifiTetherPreferenceController;
|
||||||
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
import com.android.settingslib.TetherUtil;
|
import com.android.settingslib.TetherUtil;
|
||||||
import com.android.settingslib.search.SearchIndexable;
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
@@ -82,7 +86,7 @@ public class TetherSettings extends RestrictedSettingsFragment
|
|||||||
|
|
||||||
private static final String TAG = "TetheringSettings";
|
private static final String TAG = "TetheringSettings";
|
||||||
|
|
||||||
private SwitchPreference mUsbTether;
|
private RestrictedSwitchPreference mUsbTether;
|
||||||
|
|
||||||
private SwitchPreference mBluetoothTether;
|
private SwitchPreference mBluetoothTether;
|
||||||
|
|
||||||
@@ -208,7 +212,7 @@ public class TetherSettings extends RestrictedSettingsFragment
|
|||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
void setupTetherPreference() {
|
void setupTetherPreference() {
|
||||||
mUsbTether = (SwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
|
mUsbTether = (RestrictedSwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
|
||||||
mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
|
mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
|
||||||
mEthernetTether = (SwitchPreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING);
|
mEthernetTether = (SwitchPreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING);
|
||||||
}
|
}
|
||||||
@@ -415,6 +419,8 @@ public class TetherSettings extends RestrictedSettingsFragment
|
|||||||
mUsbTether.setEnabled(false);
|
mUsbTether.setEnabled(false);
|
||||||
mUsbTether.setChecked(false);
|
mUsbTether.setChecked(false);
|
||||||
}
|
}
|
||||||
|
mUsbTether.setDisabledByAdmin(
|
||||||
|
checkIfUsbDataSignalingIsDisabled(getContext(), UserHandle.myUserId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
|
@@ -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_SINK;
|
||||||
import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;
|
import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SOURCE;
|
||||||
|
|
||||||
|
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.hardware.usb.UsbManager;
|
import android.hardware.usb.UsbManager;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
@@ -30,6 +33,7 @@ import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
|||||||
import com.android.settings.core.SubSettingLauncher;
|
import com.android.settings.core.SubSettingLauncher;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
|
import com.android.settingslib.RestrictedPreference;
|
||||||
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -45,7 +49,7 @@ public class ConnectedUsbDeviceUpdater {
|
|||||||
private UsbBackend mUsbBackend;
|
private UsbBackend mUsbBackend;
|
||||||
private DevicePreferenceCallback mDevicePreferenceCallback;
|
private DevicePreferenceCallback mDevicePreferenceCallback;
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
Preference mUsbPreference;
|
RestrictedPreference mUsbPreference;
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
UsbConnectionBroadcastReceiver mUsbReceiver;
|
UsbConnectionBroadcastReceiver mUsbReceiver;
|
||||||
|
|
||||||
@@ -88,10 +92,12 @@ public class ConnectedUsbDeviceUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void initUsbPreference(Context context) {
|
public void initUsbPreference(Context context) {
|
||||||
mUsbPreference = new Preference(context, null /* AttributeSet */);
|
mUsbPreference = new RestrictedPreference(context, null /* AttributeSet */);
|
||||||
mUsbPreference.setTitle(R.string.usb_pref);
|
mUsbPreference.setTitle(R.string.usb_pref);
|
||||||
mUsbPreference.setIcon(R.drawable.ic_usb);
|
mUsbPreference.setIcon(R.drawable.ic_usb);
|
||||||
mUsbPreference.setKey(PREF_KEY);
|
mUsbPreference.setKey(PREF_KEY);
|
||||||
|
mUsbPreference.setDisabledByAdmin(
|
||||||
|
checkIfUsbDataSignalingIsDisabled(context, UserHandle.myUserId()));
|
||||||
mUsbPreference.setOnPreferenceClickListener((Preference p) -> {
|
mUsbPreference.setOnPreferenceClickListener((Preference p) -> {
|
||||||
mMetricsFeatureProvider.logClickedPreference(p, mFragment.getMetricsCategory());
|
mMetricsFeatureProvider.logClickedPreference(p, mFragment.getMetricsCategory());
|
||||||
// New version - uses a separate screen.
|
// New version - uses a separate screen.
|
||||||
|
@@ -16,9 +16,12 @@
|
|||||||
|
|
||||||
package com.android.settings.connecteddevice.usb;
|
package com.android.settings.connecteddevice.usb;
|
||||||
|
|
||||||
|
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;
|
||||||
|
|
||||||
import android.app.settings.SettingsEnums;
|
import android.app.settings.SettingsEnums;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.os.UserHandle;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
@@ -101,6 +104,11 @@ public class UsbDetailsFragment extends DashboardFragment {
|
|||||||
*/
|
*/
|
||||||
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
new BaseSearchIndexProvider(R.xml.usb_details_fragment) {
|
new BaseSearchIndexProvider(R.xml.usb_details_fragment) {
|
||||||
|
@Override
|
||||||
|
protected boolean isPageSearchEnabled(Context context) {
|
||||||
|
return checkIfUsbDataSignalingIsDisabled(
|
||||||
|
context, UserHandle.myUserId()) != null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<AbstractPreferenceController> createPreferenceControllers(
|
public List<AbstractPreferenceController> createPreferenceControllers(
|
||||||
|
@@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
public class DefaultUsbConfigurationPreferenceController extends
|
||||||
|
DeveloperOptionsPreferenceController {
|
||||||
|
|
||||||
|
private static final String PREFERENCE_KEY = "default_usb_configuration";
|
||||||
|
|
||||||
|
private RestrictedSwitchPreference mPreference;
|
||||||
|
|
||||||
|
public DefaultUsbConfigurationPreferenceController(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return PREFERENCE_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
mPreference = screen.findPreference(getPreferenceKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
mPreference.setDisabledByAdmin(
|
||||||
|
checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
|
||||||
|
}
|
||||||
|
}
|
@@ -560,8 +560,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "feature_flags_dashboard"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "feature_flags_dashboard"));
|
||||||
controllers.add(
|
controllers.add(new DefaultUsbConfigurationPreferenceController(context));
|
||||||
new DefaultLaunchPreferenceController(context, "default_usb_configuration"));
|
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "density"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "density"));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "background_check"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "background_check"));
|
||||||
controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
|
controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
|
||||||
|
@@ -16,14 +16,19 @@
|
|||||||
|
|
||||||
package com.android.settings.development;
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
import androidx.preference.SwitchPreference;
|
import androidx.preference.SwitchPreference;
|
||||||
|
|
||||||
import com.android.settings.core.PreferenceControllerMixin;
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
|
public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
|
||||||
@@ -36,6 +41,8 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere
|
|||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
static final int SETTING_VALUE_OFF = 0;
|
static final int SETTING_VALUE_OFF = 0;
|
||||||
|
|
||||||
|
private RestrictedSwitchPreference mPreference;
|
||||||
|
|
||||||
public UsbAudioRoutingPreferenceController(Context context) {
|
public UsbAudioRoutingPreferenceController(Context context) {
|
||||||
super(context);
|
super(context);
|
||||||
}
|
}
|
||||||
@@ -45,6 +52,12 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere
|
|||||||
return USB_AUDIO_KEY;
|
return USB_AUDIO_KEY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
mPreference = screen.findPreference(getPreferenceKey());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
final boolean isEnabled = (Boolean) newValue;
|
final boolean isEnabled = (Boolean) newValue;
|
||||||
@@ -58,7 +71,9 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere
|
|||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
|
final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||||
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
|
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED, SETTING_VALUE_OFF);
|
||||||
((SwitchPreference) mPreference).setChecked(usbAudioRoutingMode != SETTING_VALUE_OFF);
|
mPreference.setChecked(usbAudioRoutingMode != SETTING_VALUE_OFF);
|
||||||
|
mPreference.setDisabledByAdmin(
|
||||||
|
checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -22,11 +22,17 @@ import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.admin.DevicePolicyManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.hardware.usb.UsbManager;
|
import android.hardware.usb.UsbManager;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||||
@@ -55,21 +61,30 @@ public class ConnectedUsbDeviceUpdaterTest {
|
|||||||
private DevicePreferenceCallback mDevicePreferenceCallback;
|
private DevicePreferenceCallback mDevicePreferenceCallback;
|
||||||
@Mock
|
@Mock
|
||||||
private UsbBackend mUsbBackend;
|
private UsbBackend mUsbBackend;
|
||||||
|
@Mock
|
||||||
|
private DevicePolicyManager mDevicePolicyManager;
|
||||||
|
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() throws Exception {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
|
|
||||||
mContext = RuntimeEnvironment.application;
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
when(mFragment.getContext()).thenReturn(mContext);
|
when(mFragment.getContext()).thenReturn(mContext);
|
||||||
mDeviceUpdater =
|
mDeviceUpdater =
|
||||||
new ConnectedUsbDeviceUpdater(mContext, mFragment, mDevicePreferenceCallback,
|
new ConnectedUsbDeviceUpdater(mContext, mFragment, mDevicePreferenceCallback,
|
||||||
mUsbBackend);
|
mUsbBackend);
|
||||||
mDeviceUpdater.mUsbReceiver = mUsbReceiver;
|
mDeviceUpdater.mUsbReceiver = mUsbReceiver;
|
||||||
|
when(mContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDevicePolicyManager);
|
||||||
|
doReturn(mContext).when(mContext).createPackageContextAsUser(
|
||||||
|
any(String.class), anyInt(), any(UserHandle.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void initUsbPreference_preferenceInit() {
|
public void initUsbPreference_preferenceInit() {
|
||||||
|
when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser(
|
||||||
|
UserHandle.myUserId())).thenReturn(true);
|
||||||
|
|
||||||
mDeviceUpdater.initUsbPreference(mContext);
|
mDeviceUpdater.initUsbPreference(mContext);
|
||||||
|
|
||||||
assertThat(mDeviceUpdater.mUsbPreference.getTitle()).isEqualTo("USB");
|
assertThat(mDeviceUpdater.mUsbPreference.getTitle()).isEqualTo("USB");
|
||||||
|
@@ -18,16 +18,21 @@ package com.android.settings.development;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
import static org.mockito.Mockito.doReturn;
|
import static org.mockito.Mockito.doReturn;
|
||||||
import static org.mockito.Mockito.spy;
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.admin.DevicePolicyManager;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
import androidx.preference.SwitchPreference;
|
|
||||||
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
@@ -41,24 +46,29 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
public class AdbPreferenceControllerTest {
|
public class AdbPreferenceControllerTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private SwitchPreference mPreference;
|
private RestrictedSwitchPreference mPreference;
|
||||||
@Mock
|
@Mock
|
||||||
private PreferenceScreen mPreferenceScreen;
|
private PreferenceScreen mPreferenceScreen;
|
||||||
@Mock
|
@Mock
|
||||||
private DevelopmentSettingsDashboardFragment mFragment;
|
private DevelopmentSettingsDashboardFragment mFragment;
|
||||||
|
@Mock
|
||||||
|
private DevicePolicyManager mDevicePolicyManager;
|
||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private AdbPreferenceController mController;
|
private AdbPreferenceController mController;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setup() {
|
public void setup() throws Exception {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
mContext = RuntimeEnvironment.application;
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
mController = spy(new AdbPreferenceController(mContext, mFragment));
|
mController = spy(new AdbPreferenceController(mContext, mFragment));
|
||||||
doReturn(true).when(mController).isAvailable();
|
doReturn(true).when(mController).isAvailable();
|
||||||
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
.thenReturn(mPreference);
|
.thenReturn(mPreference);
|
||||||
mController.displayPreference(mPreferenceScreen);
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
when(mContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDevicePolicyManager);
|
||||||
|
doReturn(mContext).when(mContext).createPackageContextAsUser(
|
||||||
|
any(String.class), anyInt(), any(UserHandle.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@@ -0,0 +1,94 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.development;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.admin.DevicePolicyManager;
|
||||||
|
import android.content.ComponentName;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
public class DefaultUsbConfigurationPreferenceControllerTest {
|
||||||
|
|
||||||
|
private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test");
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private RestrictedSwitchPreference mPreference;
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
@Mock
|
||||||
|
private DevicePolicyManager mDevicePolicyManager;
|
||||||
|
|
||||||
|
private DefaultUsbConfigurationPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() throws Exception {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
Context context = spy(RuntimeEnvironment.application);
|
||||||
|
mController = new DefaultUsbConfigurationPreferenceController(context);
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
|
||||||
|
.thenReturn(mPreference);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
when(context.getSystemService(DevicePolicyManager.class)).thenReturn(mDevicePolicyManager);
|
||||||
|
doReturn(context).when(context).createPackageContextAsUser(
|
||||||
|
any(String.class), anyInt(), any(UserHandle.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_usbDataSignalingEnabled_shouldNotDisablePreference() {
|
||||||
|
when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser(
|
||||||
|
UserHandle.myUserId())).thenReturn(true);
|
||||||
|
when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setDisabledByAdmin(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_usbDataSignalingDisabled_shouldDisablePreference() {
|
||||||
|
when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser(
|
||||||
|
UserHandle.myUserId())).thenReturn(false);
|
||||||
|
when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setDisabledByAdmin(eq(new RestrictedLockUtils.EnforcedAdmin(
|
||||||
|
TEST_COMPONENT_NAME, null, UserHandle.SYSTEM)));
|
||||||
|
}
|
||||||
|
}
|
@@ -18,14 +18,24 @@ package com.android.settings.development;
|
|||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.admin.DevicePolicyManager;
|
||||||
|
import android.content.ComponentName;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.os.UserHandle;
|
||||||
import android.provider.Settings;
|
import android.provider.Settings;
|
||||||
|
|
||||||
import androidx.preference.PreferenceScreen;
|
import androidx.preference.PreferenceScreen;
|
||||||
import androidx.preference.SwitchPreference;
|
|
||||||
|
import com.android.settingslib.RestrictedLockUtils;
|
||||||
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
@@ -38,26 +48,36 @@ import org.robolectric.RuntimeEnvironment;
|
|||||||
@RunWith(RobolectricTestRunner.class)
|
@RunWith(RobolectricTestRunner.class)
|
||||||
public class UsbAudioRoutingPreferenceControllerTest {
|
public class UsbAudioRoutingPreferenceControllerTest {
|
||||||
|
|
||||||
|
private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test");
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private PreferenceScreen mScreen;
|
private PreferenceScreen mScreen;
|
||||||
@Mock
|
@Mock
|
||||||
private SwitchPreference mPreference;
|
private RestrictedSwitchPreference mPreference;
|
||||||
|
@Mock
|
||||||
|
private DevicePolicyManager mDevicePolicyManager;
|
||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
|
|
||||||
private UsbAudioRoutingPreferenceController mController;
|
private UsbAudioRoutingPreferenceController mController;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() throws Exception {
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
mContext = RuntimeEnvironment.application;
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
mController = new UsbAudioRoutingPreferenceController(mContext);
|
mController = new UsbAudioRoutingPreferenceController(mContext);
|
||||||
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
|
||||||
mController.displayPreference(mScreen);
|
mController.displayPreference(mScreen);
|
||||||
|
when(mContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDevicePolicyManager);
|
||||||
|
doReturn(mContext).when(mContext).createPackageContextAsUser(
|
||||||
|
any(String.class), anyInt(), any(UserHandle.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void updateState_usbAudioRoutingEnabled_shouldCheckedPreference() {
|
public void updateState_usbAudioRoutingEnabled_shouldCheckedPreference() {
|
||||||
|
when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser(
|
||||||
|
UserHandle.myUserId())).thenReturn(true);
|
||||||
|
when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME);
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(),
|
Settings.Secure.putInt(mContext.getContentResolver(),
|
||||||
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
|
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
|
||||||
UsbAudioRoutingPreferenceController.SETTING_VALUE_ON);
|
UsbAudioRoutingPreferenceController.SETTING_VALUE_ON);
|
||||||
@@ -69,6 +89,9 @@ public class UsbAudioRoutingPreferenceControllerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void updateState_usbAudioRoutingDisabled_shouldUncheckedPreference() {
|
public void updateState_usbAudioRoutingDisabled_shouldUncheckedPreference() {
|
||||||
|
when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser(
|
||||||
|
UserHandle.myUserId())).thenReturn(true);
|
||||||
|
when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME);
|
||||||
Settings.Secure.putInt(mContext.getContentResolver(),
|
Settings.Secure.putInt(mContext.getContentResolver(),
|
||||||
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
|
Settings.Secure.USB_AUDIO_AUTOMATIC_ROUTING_DISABLED,
|
||||||
UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
|
UsbAudioRoutingPreferenceController.SETTING_VALUE_OFF);
|
||||||
@@ -78,6 +101,18 @@ public class UsbAudioRoutingPreferenceControllerTest {
|
|||||||
verify(mPreference).setChecked(false);
|
verify(mPreference).setChecked(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_usbDataSignalingDisabled_shouldDisablePreference() {
|
||||||
|
when(mDevicePolicyManager.isUsbDataSignalingEnabledForUser(
|
||||||
|
UserHandle.myUserId())).thenReturn(false);
|
||||||
|
when(mDevicePolicyManager.getProfileOwner()).thenReturn(TEST_COMPONENT_NAME);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setDisabledByAdmin(eq(new RestrictedLockUtils.EnforcedAdmin(
|
||||||
|
TEST_COMPONENT_NAME, null, UserHandle.SYSTEM)));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onPreferenceChange_preferenceChecked_shouldEnableUsbAudioRouting() {
|
public void onPreferenceChange_preferenceChecked_shouldEnableUsbAudioRouting() {
|
||||||
mController.onPreferenceChange(mPreference, true /* new value */);
|
mController.onPreferenceChange(mPreference, true /* new value */);
|
||||||
|
Reference in New Issue
Block a user