Merge "SettingsLib: Disable USB debugging if USB signaling is off" into sc-dev

2021-03-24 10:13:47 +00:00
parent 745af612b6 aaea2d2266
commit 5dc3fd4619
1 changed files with 9 additions and 0 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
@@ -86,6 +86,15 @@ public abstract class AbstractEnableAdbPreferenceController extends
        }
    }

+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        super.onDeveloperOptionsSwitchEnabled();
+        if (isAvailable()) {
+            mPreference.setDisabledByAdmin(
+                    checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
+        }
+    }
+
    public void enablePreference(boolean enabled) {
        if (isAvailable()) {
            mPreference.setEnabled(enabled);