7d4db750e6
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
58 lines
2.4 KiB
XML
58 lines
2.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2008 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.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/tether_settings_title_all">
|
|
|
|
<com.android.settingslib.widget.TopIntroPreference
|
|
android:key="tether_prefs_top_intro"
|
|
settings:searchable="false"/>
|
|
|
|
<com.android.settings.widget.FixedLineSummaryPreference
|
|
android:key="wifi_tether"
|
|
android:title="@string/wifi_hotspot_checkbox_text"
|
|
android:summary="@string/summary_placeholder"
|
|
android:fragment="com.android.settings.wifi.tether.WifiTetherSettings"
|
|
settings:allowDividerAbove="true"
|
|
settings:summaryLineCount="2"/>
|
|
|
|
<com.android.settingslib.RestrictedSwitchPreference
|
|
android:key="usb_tether_settings"
|
|
android:title="@string/usb_tethering_button_text"
|
|
android:summary="@string/usb_tethering_subtext"
|
|
settings:keywords="@string/keywords_hotspot_tethering" />
|
|
|
|
<SwitchPreference
|
|
android:key="enable_bluetooth_tethering"
|
|
android:title="@string/bluetooth_tether_checkbox_text"
|
|
android:summary="@string/bluetooth_tethering_subtext"
|
|
settings:keywords="@string/keywords_hotspot_tethering" />
|
|
|
|
<SwitchPreference
|
|
android:key="enable_ethernet_tethering"
|
|
android:title="@string/ethernet_tether_checkbox_text"
|
|
android:summary="@string/ethernet_tethering_subtext"
|
|
settings:keywords="@string/keywords_hotspot_tethering" />
|
|
|
|
<Preference
|
|
android:key="disabled_on_data_saver"
|
|
android:summary="@string/tether_settings_disabled_on_data_saver"
|
|
android:selectable="false"
|
|
settings:allowDividerAbove="true" />
|
|
</PreferenceScreen>
|