Merge "[Catalyst] Update the permissions" into main

This commit is contained in:
Treehugger Robot
2025-02-05 22:15:38 -08:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 8 deletions

View File

@@ -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

View File

@@ -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