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:
@@ -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, "quick_settings_tiles"));
|
||||
controllers.add(new DefaultLaunchPreferenceController(context, "feature_flags_dashboard"));
|
||||
controllers.add(
|
||||
new DefaultLaunchPreferenceController(context, "default_usb_configuration"));
|
||||
controllers.add(new DefaultUsbConfigurationPreferenceController(context));
|
||||
controllers.add(new DefaultLaunchPreferenceController(context, "density"));
|
||||
controllers.add(new DefaultLaunchPreferenceController(context, "background_check"));
|
||||
controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
|
||||
|
||||
@@ -16,14 +16,19 @@
|
||||
|
||||
package com.android.settings.development;
|
||||
|
||||
import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.RestrictedSwitchPreference;
|
||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||
|
||||
public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
|
||||
@@ -36,6 +41,8 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere
|
||||
@VisibleForTesting
|
||||
static final int SETTING_VALUE_OFF = 0;
|
||||
|
||||
private RestrictedSwitchPreference mPreference;
|
||||
|
||||
public UsbAudioRoutingPreferenceController(Context context) {
|
||||
super(context);
|
||||
}
|
||||
@@ -45,6 +52,12 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere
|
||||
return USB_AUDIO_KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
final boolean isEnabled = (Boolean) newValue;
|
||||
@@ -58,7 +71,9 @@ public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPrefere
|
||||
public void updateState(Preference preference) {
|
||||
final int usbAudioRoutingMode = Settings.Secure.getInt(mContext.getContentResolver(),
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user