Merge "Update switch status of PrimarySwitchPrefence when disallow by Admin" into tm-dev

2022-05-06 15:39:03 +00:00
parent 7ee5bcf827 8e9be558b8
commit 6cbe51cb4e
1 changed files with 5 additions and 0 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java
@@ -234,5 +234,10 @@ public class RestrictedPreferenceHelper {
        if (!(mPreference instanceof RestrictedTopLevelPreference)) {
            mPreference.setEnabled(!(mDisabledByAdmin || mDisabledByAppOps));
        }
+
+        if (mPreference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) mPreference)
+                    .setSwitchEnabled(!(mDisabledByAdmin || mDisabledByAppOps));
+        }
    }
 }