From 8e9be558b87c1c791abaffaf1824994db65d5a9a Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Thu, 5 May 2022 16:39:29 +0800 Subject: [PATCH] Update switch status of PrimarySwitchPrefence when disallow by Admin Bug: 230430179 Test: robotest & manual verify Change-Id: I30ed5dfdcf09a83ae6030ede269d426a82def596 --- .../com/android/settingslib/RestrictedPreferenceHelper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreferenceHelper.java index 284da73efb6f2..2f30baa79b9de 100644 --- 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)); + } } }