Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Johnston
2021-03-24 10:13:47 +00:00
committed by Android (Google) Code Review
parent 745af612b6 aaea2d2266
commit 5dc3fd4619
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/development/AbstractEnableAdbPreferenceController.java
View File

@@ -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) { public void enablePreference(boolean enabled) {
if (isAvailable()) { if (isAvailable()) {
mPreference.setEnabled(enabled); mPreference.setEnabled(enabled);