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:
@@ -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.
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user