diff options
| author | Alex Johnston <acjohnston@google.com> | 2021-03-17 15:18:00 +0000 |
|---|---|---|
| committer | Alex Johnston <acjohnston@google.com> | 2021-03-23 11:43:28 +0000 |
| commit | 46c72f3cac641de782ffac8e68f290b7b7fe34d1 (patch) | |
| tree | 6cb8729590531a7a3c0e78b8be876e13d62a5d60 /src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java | |
| parent | caf50d12031ea7b1dfd5fa0245db24817c377af8 (diff) | |
Settings: Disable USB preferences if USB signaling is off
* When developer options is turned
off and on again, 'Default USB
configuration' and 'Disable USB
audio routing' should not be enabled
if USB data signaling is disabled.
Manual testing:
* Disable USB data signaling
* Verify preferences are disabled
* Turn developer options off and on
* Verify preferences remain disabled
Bug: 180711035
Test: manual testing
make RunSettingsRoboTests -j ROBOTEST_FILTER=UsbAudioRoutingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=DefaultUsbConfigurationPreferenceControllerTest
Change-Id: Id08228da812b7534e2217b0c3f30a7ac989f7553
Diffstat (limited to 'src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java')
| -rw-r--r-- | src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java index 905c552e02..be7704fd73 100644 --- a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java +++ b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java @@ -54,4 +54,11 @@ public class DefaultUsbConfigurationPreferenceController extends mPreference.setDisabledByAdmin( checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId())); } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + super.onDeveloperOptionsSwitchEnabled(); + mPreference.setDisabledByAdmin( + checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId())); + } } |