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

Merge changes from topic "catalyst-battery" into main

Browse Source 
* changes:
  [Catalyst] Implement get{Read,Write}Permissions for Battery percentage
  [Catalyst] Implement get{Read,Write}Permissions for Battery level
This commit is contained in:
Treehugger Robot
2024-12-25 01:52:05 -08:00
committed by Android (Google) Code Review
parent 6e27501831 68ddca4c9a
commit 12966f2608
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/display/BatteryPercentageSwitchPreference.kt
View File

@@ -49,9 +49,13 @@ class BatteryPercentageSwitchPreference :
com.android.internal.R.bool.config_battery_percentage_setting_available 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) = override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW ReadWritePermit.ALLOW
override fun getWritePermissions(context: Context) = SettingsSystemStore.getWritePermissions()
override fun getWritePermit( override fun getWritePermit(
context: Context, context: Context,
value: Boolean?, value: Boolean?,

5
src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt
View File

@@ -24,6 +24,7 @@ import com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType
import com.android.settingslib.Utils import com.android.settingslib.Utils
import com.android.settingslib.datastore.KeyValueStore import com.android.settingslib.datastore.KeyValueStore
import com.android.settingslib.datastore.NoOpKeyedObservable import com.android.settingslib.datastore.NoOpKeyedObservable
import com.android.settingslib.datastore.Permissions
import com.android.settingslib.fuelgauge.BatteryUtils import com.android.settingslib.fuelgauge.BatteryUtils
import com.android.settingslib.metadata.PersistentPreference import com.android.settingslib.metadata.PersistentPreference
import com.android.settingslib.metadata.PreferenceLifecycleContext import com.android.settingslib.metadata.PreferenceLifecycleContext
@@ -102,9 +103,13 @@ class BatteryHeaderPreference :
override fun getMaxValue(context: Context): Int = 100 override fun getMaxValue(context: Context): Int = 100
override fun getReadPermissions(context: Context) = Permissions.EMPTY
override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) = override fun getReadPermit(context: Context, callingPid: Int, callingUid: Int) =
ReadWritePermit.ALLOW ReadWritePermit.ALLOW
override fun getWritePermissions(context: Context) = Permissions.EMPTY
override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) = override fun getWritePermit(context: Context, value: Int?, callingPid: Int, callingUid: Int) =
ReadWritePermit.DISALLOW ReadWritePermit.DISALLOW