From 13cac3971ee916ed9e36a104398af361c9f3b0dd Mon Sep 17 00:00:00 2001 From: Jacky Wang Date: Wed, 25 Dec 2024 16:29:09 +0800 Subject: [PATCH 1/2] [Catalyst] Implement get{Read,Write}Permissions for Battery level NO_IFTTT=Catalyst only Fix: 385290271 Flag: com.android.settings.flags.catalyst_power_usage_summary_screen Test: devtool Change-Id: I30e2a698a9d8544684b4369519d174aba560e566 --- .../android/settings/fuelgauge/BatteryHeaderPreference.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt index 49f219f8eea..9029a8511ff 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreference.kt @@ -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 From 68ddca4c9a1b826af6ecaacf8c08748f2f74dec7 Mon Sep 17 00:00:00 2001 From: Jacky Wang Date: Wed, 25 Dec 2024 16:33:32 +0800 Subject: [PATCH 2/2] [Catalyst] Implement get{Read,Write}Permissions for Battery percentage NO_IFTTT=Catalyst only Fix: 385288692 Flag: com.android.settings.flags.catalyst_power_usage_summary_screen Test: devtool Change-Id: I42ba759cac04ffc41787b0fca3e04f64584c57c9 --- .../settings/display/BatteryPercentageSwitchPreference.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt b/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt index fb2b74c98e3..0cdca343ea8 100644 --- a/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt +++ b/src/com/android/settings/display/BatteryPercentageSwitchPreference.kt @@ -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?,