commit 0dc6180a2764867b4f23d5d8bfb84ccd48134b7e
author Jacky Wang <jiannan@google.com> Tue Dec 10 17:27:39 2024 +0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Dec 10 19:48:57 2024 +0000
tree 249d991198887fba4fc6aa11a068aa8eb9de5189
parent d458d4a6dc07257341086abb3638ae20ecaa1b79

[Catalyst] Fix enable state for Wi-Fi hotspot

NO_IFTTT=Catalyst only

Bug: 383232049
Flag: com.android.settings.flags.catalyst_tether_settings
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d595b169d61b1d0fac08165b822aeedd0d4e3ee)
Merged-In: I067e97820a19822eaad2e93e30d42f7f767bf855
Change-Id: I067e97820a19822eaad2e93e30d42f7f767bf855

src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt

diff --git a/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt b/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
index c185e02..931583a 100644
--- a/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
+++ b/src/com/android/settings/wifi/tether/WifiHotspotSwitchPreference.kt
@@ -100,7 +100,7 @@
             .toIntent()
 
     override fun isEnabled(context: Context) =
-        wifiHotspotStore.dataSaverStore.getBoolean(DATA_SAVER_KEY) == true &&
+        wifiHotspotStore.dataSaverStore.getBoolean(DATA_SAVER_KEY) != true &&
             super<PreferenceRestrictionMixin>.isEnabled(context)
 
     override val restrictionKeys
@@ -193,6 +193,7 @@
         super.bind(preference, metadata)
         (preference as PrimarySwitchPreference).apply {
             isChecked = preferenceDataStore!!.getBoolean(key, false)
+            isSwitchEnabled = isEnabled
         }
     }