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

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

Merge changes from topic "catalyst-battery" into main 

* changes:
  [Catalyst] Implement get{Read,Write}Permissions for Battery percentage
  [Catalyst] Implement get{Read,Write}Permissions for Battery level
parents 6e275018 68ddca4c

src/com/android/settings/display/BatteryPercentageSwitchPreference.kt

+4 −0
Original line number Diff line number Diff line
@@ -49,9 +49,13 @@ class BatteryPercentageSwitchPreference : 
                com.android.internal.R.bool.config_battery_percentage_setting_available

            )



    override fun getReadPermissions(context: Context) = SettingsSystemStore.getReadPermissions()



    override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =

        ReadWritePermit.ALLOW



    override fun getWritePermissions(context: Context) = SettingsSystemStore.getWritePermissions()



    override fun getWritePermit(

        context: Context,

        value: Boolean?,

src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType 
import com.android.settingslib.Utils

import com.android.settingslib.datastore.KeyValueStore

import com.android.settingslib.datastore.NoOpKeyedObservable

import com.android.settingslib.datastore.Permissions

import com.android.settingslib.fuelgauge.BatteryUtils

import com.android.settingslib.metadata.PersistentPreference

import com.android.settingslib.metadata.PreferenceLifecycleContext
@@ -102,9 +103,13 @@ class BatteryHeaderPreference : 


    override fun getMaxValue(context: Context): Int = 100



    override fun getReadPermissions(context: Context) = Permissions.EMPTY



    override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =

        ReadWritePermit.ALLOW



    override fun getWritePermissions(context: Context) = Permissions.EMPTY



    override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =

        ReadWritePermit.DISALLOW