commit e8bbf576c9c9a53e5d306a532101e9a1b4b64910
author Alex Johnston <acjohnston@google.com> Tue Apr 26 10:18:01 2022 +0100
committer Alex Johnston <acjohnston@google.com> Tue Apr 26 10:18:01 2022 +0100
tree ba9818d008dc915b4bbd7214b39192a08325539c
parent 7d5cc42c81b98014223b9d7e12e2080581380979

Fix USB tethering grey out behaviour

Grey out USB tethering when USB is disconnected

Bug: 200113957
Bug: 223477825
Test: Manual testing with TestDPC
Change-Id: I40eb04d6e96f4963129dc9d6dc9001b0c54185ef

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index da21729..012996b 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -416,8 +416,11 @@
         if (usbTethered) {
             mUsbTether.setEnabled(!mDataSaverEnabled);
             mUsbTether.setChecked(true);
-            mUsbTether.setDisabledByAdmin(
-                    checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId()));
+            final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
+                    checkIfUsbDataSignalingIsDisabled(mContext, UserHandle.myUserId());
+            if (enforcedAdmin != null) {
+                mUsbTether.setDisabledByAdmin(enforcedAdmin);
+            }
         } else {
             mUsbTether.setChecked(false);
             updateUsbPreference();