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

Merge "[Catalyst] Update the permissions" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-02-05 22:15:38 -08:00
committed by Android (Google) Code Review
parent 72a5fdd400 4f2e409a3e
commit 6fc41de03c
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt
View File

@@ -16,7 +16,6 @@
package com.android.settings.datausage package com.android.settings.datausage
import android.Manifest
import android.app.settings.SettingsEnums.ACTION_DATA_SAVER_MODE import android.app.settings.SettingsEnums.ACTION_DATA_SAVER_MODE
import android.content.Context import android.content.Context
import com.android.settings.PreferenceActionMetricsProvider import com.android.settings.PreferenceActionMetricsProvider
@@ -50,11 +49,9 @@ class DataSaverMainSwitchPreference :
override fun storage(context: Context) = createDataStore(context) override fun storage(context: Context) = createDataStore(context)
override fun getReadPermissions(context: Context) = override fun getReadPermissions(context: Context) = Permissions.EMPTY
Permissions.allOf(Manifest.permission.MANAGE_NETWORK_POLICY)
override fun getWritePermissions(context: Context) = override fun getWritePermissions(context: Context) = Permissions.EMPTY
Permissions.allOf(Manifest.permission.MANAGE_NETWORK_POLICY)
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW ReadWritePermit.ALLOW

4
src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt
View File

@@ -16,7 +16,6 @@
package com.android.settings.network package com.android.settings.network
import android.Manifest
import android.content.Context import android.content.Context
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED import android.provider.Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED
@@ -39,8 +38,7 @@ class AdaptiveConnectivityTogglePreference :
override fun getReadPermissions(context: Context) = SettingsSecureStore.getReadPermissions() override fun getReadPermissions(context: Context) = SettingsSecureStore.getReadPermissions()
override fun getWritePermissions(context: Context) = override fun getWritePermissions(context: Context) = SettingsSecureStore.getWritePermissions()
SettingsSecureStore.getWritePermissions() and Manifest.permission.NETWORK_SETTINGS
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW ReadWritePermit.ALLOW