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

Fix post-comment in ag/27593647 to improve the readability.

Browse Source 
Bug: 338965652
Test: atest + manual
Change-Id: I8e4c8a4508dd8c5afd1f16c6129146ba6e13bde2
This commit is contained in:
mxyyiyi
2024-06-04 11:30:47 +08:00
parent d6fe83b86e
commit 00507a47ec
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtils.kt
View File

@@ -58,19 +58,19 @@ object AppOptModeSharedPreferencesUtils {
uids,
packageNames,
optimizationModes,
expirationTimes
expirationTimes,
) { uid: Int, packageName: String ->
BatteryOptimizeUtils(context, uid, packageName)
}
/** Resets the app optimization mode event data since the query timestamp. */
@JvmStatic
fun resetExpiredAppOptModeBeforeTimestamp(context: Context, queryTimestamp: Long) =
fun resetExpiredAppOptModeBeforeTimestamp(context: Context, queryTimestampMs: Long) =
synchronized(appOptimizationModeLock) {
val eventsMap = getAppOptModeEventsMap(context)
val expirationUids = ArrayList<Int>(eventsMap.size)
for ((uid, event) in eventsMap) {
if (event.expirationTime > queryTimestamp) {
if (event.expirationTime > queryTimestampMs) {
continue
}
updateBatteryOptimizationMode(
@@ -98,7 +98,7 @@ object AppOptModeSharedPreferencesUtils {
packageNames: List<String>,
optimizationModes: List<Int>,
expirationTimes: LongArray,
getBatteryOptimizeUtils: (Int, String) -> BatteryOptimizeUtils
getBatteryOptimizeUtils: (Int, String) -> BatteryOptimizeUtils,
) =
synchronized(appOptimizationModeLock) {
val eventsMap = getAppOptModeEventsMap(context)
@@ -114,7 +114,7 @@ object AppOptModeSharedPreferencesUtils {
packageName,
optimizationMode,
Action.EXTERNAL_UPDATE,
getBatteryOptimizeUtils(uid, packageName)
getBatteryOptimizeUtils(uid, packageName),
)
if (originalOptMode == BatteryOptimizeUtils.MODE_UNKNOWN) {
continue
@@ -151,7 +151,8 @@ object AppOptModeSharedPreferencesUtils {
packageName: String,
optimizationMode: Int,
action: Action,
batteryOptimizeUtils: BatteryOptimizeUtils = BatteryOptimizeUtils(context, uid, packageName)
batteryOptimizeUtils: BatteryOptimizeUtils =
BatteryOptimizeUtils(context, uid, packageName),
): Int {
if (!batteryOptimizeUtils.isOptimizeModeMutable) {
Log.w(TAG, "Fail to update immutable optimization mode for: $packageName")
@@ -190,7 +191,7 @@ object AppOptModeSharedPreferencesUtils {
private fun updateSharedPreferences(
context: Context,
eventsMap: Map<Int, AppOptimizationModeEvent>
eventsMap: Map<Int, AppOptimizationModeEvent>,
) {
val sharedPreferences = getSharedPreferences(context)
sharedPreferences.edit().run {
@@ -216,7 +217,7 @@ object AppOptModeSharedPreferencesUtils {
}
private fun deserializeAppOptimizationModeEvent(
encodedProtoString: String
encodedProtoString: String,
): AppOptimizationModeEvent {
return BatteryUtils.parseProtoFromString(encodedProtoString, defaultInstance)
}