From 1568db6ea4fa73f89464ee926090454c97d906d2 Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 26 Dec 2024 13:13:31 +0800 Subject: [PATCH] [Catalyst] Implement get{Read,Write}Permissions for Adaptive connectivity NO_IFTTT=Catalyst only Fix: 385266011 Flag: com.android.settings.flags.catalyst_adaptive_connectivity Test: devtool Change-Id: I06505cc934ad829edb6a9b62ec0848cedcc814a2 --- .../network/AdaptiveConnectivityTogglePreference.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt index 77a141eb736..ec5061ee0fa 100644 --- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt +++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt @@ -16,6 +16,7 @@ package com.android.settings.network +import android.Manifest import android.content.Context import android.net.wifi.WifiManager import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED @@ -24,6 +25,7 @@ import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyedObservableDelegate import com.android.settingslib.datastore.SettingsSecureStore import com.android.settingslib.datastore.SettingsStore +import com.android.settingslib.datastore.and import com.android.settingslib.metadata.MainSwitchPreference import com.android.settingslib.metadata.ReadWritePermit import com.android.settingslib.metadata.SensitivityLevel @@ -35,6 +37,11 @@ class AdaptiveConnectivityTogglePreference : override fun storage(context: Context): KeyValueStore = AdaptiveConnectivityToggleStorage(context, SettingsSecureStore.get(context)) + override fun getReadPermissions(context: Context) = SettingsSecureStore.getReadPermissions() + + override fun getWritePermissions(context: Context) = + SettingsSecureStore.getWritePermissions() and Manifest.permission.NETWORK_SETTINGS + override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = ReadWritePermit.ALLOW