Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fc41de0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Catalyst] Update the permissions" into main

parents 72a5fdd4 4f2e409a

src/com/android/settings/datausage/DataSaverMainSwitchPreference.kt

+2 −5
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/network/AdaptiveConnectivityTogglePreference.kt

+1 −3
Original line number Diff line number Diff line
@@ -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