PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Thread] use dedicated flag for Thread settings" into main am: 33722b512a am: c19a1094d7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3002558

Change-Id: I1c28a4a870b8ded5aad1b32e1e4e7f505d580138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kangping Dong
2024-03-14 06:19:07 +00:00
committed by Automerger Merge Worker
parent 5d5f125c0a c19a1094d7
commit b0c7563cdf
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/connecteddevice/threadnetwork/ThreadNetworkPreferenceController.kt
View File

@@ -34,9 +34,9 @@ import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
import androidx.preference.Preference
import androidx.preference.PreferenceScreen
import com.android.net.thread.platform.flags.Flags
import com.android.settings.R
import com.android.settings.core.TogglePreferenceController
import com.android.settings.flags.Flags
import java.util.concurrent.Executor
/** Controller for the "Thread" toggle in "Connected devices > Connection preferences". */
@@ -110,7 +110,7 @@ class ThreadNetworkPreferenceController @VisibleForTesting constructor(
}
override fun getAvailabilityStatus(): Int {
return if (!Flags.threadEnabledPlatform()) {
return if (!Flags.threadSettingsEnabled()) {
CONDITIONALLY_UNAVAILABLE
} else if (!isThreadSupportedOnDevice) {
UNSUPPORTED_ON_DEVICE