From 4f2e409a3ea575155fa8ba2b8b894c6eca69233e Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Thu, 6 Feb 2025 03:08:44 +0000 Subject: [PATCH] [Catalyst] Update the permissions NO_IFTTT=Catalyst only Bug: 392691854 Bug: 392691083 Test: devtool Flag: EXEMPT bugfix Change-Id: Id7809ab699745fff4ef040d4a7141498a58e04e8 --- .../settings/datausage/DataSaverMainSwitchPreference.kt | 7 ++----- .../network/AdaptiveConnectivityTogglePreference.kt | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt b/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt index b46fe99c254..33d756ee811 100644 --- a/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt +++ b/src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt @@ -16,7 +16,6 @@ package com.android.settings.datausage -import android.Manifest import android.app.settings.SettingsEnums.ACTION_DATA_SAVER_MODE import android.content.Context import com.android.settings.PreferenceActionMetricsProvider @@ -50,11 +49,9 @@ class DataSaverMainSwitchPreference : override fun storage(context: Context) = createDataStore(context) - override fun getReadPermissions(context: Context) = - Permissions.allOf(Manifest.permission.MANAGE_NETWORK_POLICY) + override fun getReadPermissions(context: Context) = Permissions.EMPTY - override fun getWritePermissions(context: Context) = - Permissions.allOf(Manifest.permission.MANAGE_NETWORK_POLICY) + override fun getWritePermissions(context: Context) = Permissions.EMPTY override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = ReadWritePermit.ALLOW diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt index ec5061ee0fa..c9ba7141b49 100644 --- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt +++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt @@ -16,7 +16,6 @@ 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 @@ -39,8 +38,7 @@ class AdaptiveConnectivityTogglePreference : override fun getReadPermissions(context: Context) = SettingsSecureStore.getReadPermissions() - override fun getWritePermissions(context: Context) = - SettingsSecureStore.getWritePermissions() and Manifest.permission.NETWORK_SETTINGS + override fun getWritePermissions(context: Context) = SettingsSecureStore.getWritePermissions() override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = ReadWritePermit.ALLOW