From e8bbf576c9c9a53e5d306a532101e9a1b4b64910 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Tue, 26 Apr 2022 10:18:01 +0100
Subject: [PATCH] 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 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index da21729d72e..012996b878d 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -416,8 +416,11 @@ public class TetherSettings extends RestrictedSettingsFragment
         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();