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

Merge "Fix post-comment in ag/27593647 to improve the readability." into main

Browse Source
This commit is contained in:
YK Hung
2024-06-04 10:25:00 +00:00
committed by Android (Google) Code Review
parent 28f51a934a 00507a47ec
commit d76f5b8233
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, uids,
packageNames, packageNames,
optimizationModes, optimizationModes,
expirationTimes expirationTimes,
) { uid: Int, packageName: String -> ) { uid: Int, packageName: String ->
BatteryOptimizeUtils(context, uid, packageName) BatteryOptimizeUtils(context, uid, packageName)
} }
/** Resets the app optimization mode event data since the query timestamp. */ /** Resets the app optimization mode event data since the query timestamp. */
@JvmStatic @JvmStatic
fun resetExpiredAppOptModeBeforeTimestamp(context: Context, queryTimestamp: Long) = fun resetExpiredAppOptModeBeforeTimestamp(context: Context, queryTimestampMs: Long) =
synchronized(appOptimizationModeLock) { synchronized(appOptimizationModeLock) {
val eventsMap = getAppOptModeEventsMap(context) val eventsMap = getAppOptModeEventsMap(context)
val expirationUids = ArrayList<Int>(eventsMap.size) val expirationUids = ArrayList<Int>(eventsMap.size)
for ((uid, event) in eventsMap) { for ((uid, event) in eventsMap) {
if (event.expirationTime > queryTimestamp) { if (event.expirationTime > queryTimestampMs) {
continue continue
} }
updateBatteryOptimizationMode( updateBatteryOptimizationMode(
@@ -98,7 +98,7 @@ object AppOptModeSharedPreferencesUtils {
packageNames: List<String>, packageNames: List<String>,
optimizationModes: List<Int>, optimizationModes: List<Int>,
expirationTimes: LongArray, expirationTimes: LongArray,
getBatteryOptimizeUtils: (Int, String) -> BatteryOptimizeUtils getBatteryOptimizeUtils: (Int, String) -> BatteryOptimizeUtils,
) = ) =
synchronized(appOptimizationModeLock) { synchronized(appOptimizationModeLock) {
val eventsMap = getAppOptModeEventsMap(context) val eventsMap = getAppOptModeEventsMap(context)
@@ -114,7 +114,7 @@ object AppOptModeSharedPreferencesUtils {
packageName, packageName,
optimizationMode, optimizationMode,
Action.EXTERNAL_UPDATE, Action.EXTERNAL_UPDATE,
getBatteryOptimizeUtils(uid, packageName) getBatteryOptimizeUtils(uid, packageName),
) )
if (originalOptMode == BatteryOptimizeUtils.MODE_UNKNOWN) { if (originalOptMode == BatteryOptimizeUtils.MODE_UNKNOWN) {
continue continue
@@ -151,7 +151,8 @@ object AppOptModeSharedPreferencesUtils {
packageName: String, packageName: String,
optimizationMode: Int, optimizationMode: Int,
action: Action, action: Action,
batteryOptimizeUtils: BatteryOptimizeUtils = BatteryOptimizeUtils(context, uid, packageName) batteryOptimizeUtils: BatteryOptimizeUtils =
BatteryOptimizeUtils(context, uid, packageName),
): Int { ): Int {
if (!batteryOptimizeUtils.isOptimizeModeMutable) { if (!batteryOptimizeUtils.isOptimizeModeMutable) {
Log.w(TAG, "Fail to update immutable optimization mode for: $packageName") Log.w(TAG, "Fail to update immutable optimization mode for: $packageName")
@@ -190,7 +191,7 @@ object AppOptModeSharedPreferencesUtils {
private fun updateSharedPreferences( private fun updateSharedPreferences(
context: Context, context: Context,
eventsMap: Map<Int, AppOptimizationModeEvent> eventsMap: Map<Int, AppOptimizationModeEvent>,
) { ) {
val sharedPreferences = getSharedPreferences(context) val sharedPreferences = getSharedPreferences(context)
sharedPreferences.edit().run { sharedPreferences.edit().run {
@@ -216,7 +217,7 @@ object AppOptModeSharedPreferencesUtils {
} }
private fun deserializeAppOptimizationModeEvent( private fun deserializeAppOptimizationModeEvent(
encodedProtoString: String encodedProtoString: String,
): AppOptimizationModeEvent { ): AppOptimizationModeEvent {
return BatteryUtils.parseProtoFromString(encodedProtoString, defaultInstance) return BatteryUtils.parseProtoFromString(encodedProtoString, defaultInstance)
} }

58
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/AppOptModeSharedPreferencesUtilsTest.kt
View File

@@ -43,7 +43,7 @@ import org.robolectric.RobolectricTestRunner
@RunWith(RobolectricTestRunner::class) @RunWith(RobolectricTestRunner::class)
class AppOptModeSharedPreferencesUtilsTest { class AppOptModeSharedPreferencesUtilsTest {
@JvmField @Rule val mockitoRule: MockitoRule = MockitoJUnit.rule() @get:Rule val mockitoRule: MockitoRule = MockitoJUnit.rule()
@Spy private var context: Context = ApplicationProvider.getApplicationContext() @Spy private var context: Context = ApplicationProvider.getApplicationContext()
@@ -62,36 +62,48 @@ class AppOptModeSharedPreferencesUtilsTest {
@Test @Test
fun updateAppOptModeExpirationInternal_withExpirationTime_verifyData() { fun updateAppOptModeExpirationInternal_withExpirationTime_verifyData() {
insertAppOptModeEventForTest(/* expirationTime= */ 1000L) insertAppOptModeEventForTest(expirationTime = 1000L)
val events = AppOptModeSharedPreferencesUtils.getAllEvents(context) val events = AppOptModeSharedPreferencesUtils.getAllEvents(context)
assertThat(events.size).isEqualTo(1) assertThat(events).hasSize(1)
assertAppOptimizationModeEventInfo(events.get(0), UID, PACKAGE_NAME, MODE_OPTIMIZED, 1000L) assertAppOptimizationModeEventInfo(
events[0],
UID,
PACKAGE_NAME,
MODE_OPTIMIZED,
expirationTime = 1000L
)
} }
@Test @Test
fun updateAppOptModeExpirationInternal_withoutExpirationTime_verifyEmptyList() { fun updateAppOptModeExpirationInternal_withoutExpirationTime_verifyEmptyList() {
insertAppOptModeEventForTest(/* expirationTime= */ UNLIMITED_EXPIRE_TIME) insertAppOptModeEventForTest(expirationTime = UNLIMITED_EXPIRE_TIME)
assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty() assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty()
} }
@Test @Test
fun deleteAppOptimizationModeEventByUid_uidNotContained_verifyData() { fun deleteAppOptimizationModeEventByUid_uidNotContained_verifyData() {
insertAppOptModeEventForTest(/* expirationTime= */ 1000L) insertAppOptModeEventForTest(expirationTime = 1000L)
assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context).size).isEqualTo(1) assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).hasSize(1)
AppOptModeSharedPreferencesUtils.deleteAppOptimizationModeEventByUid(context, UNSET_UID) AppOptModeSharedPreferencesUtils.deleteAppOptimizationModeEventByUid(context, UNSET_UID)
val events = AppOptModeSharedPreferencesUtils.getAllEvents(context) val events = AppOptModeSharedPreferencesUtils.getAllEvents(context)
assertThat(events.size).isEqualTo(1) assertThat(events).hasSize(1)
assertAppOptimizationModeEventInfo(events.get(0), UID, PACKAGE_NAME, MODE_OPTIMIZED, 1000L) assertAppOptimizationModeEventInfo(
events[0],
UID,
PACKAGE_NAME,
MODE_OPTIMIZED,
expirationTime = 1000L
)
} }
@Test @Test
fun deleteAppOptimizationModeEventByUid_uidExisting_verifyData() { fun deleteAppOptimizationModeEventByUid_uidExisting_verifyData() {
insertAppOptModeEventForTest(/* expirationTime= */ 1000L) insertAppOptModeEventForTest(expirationTime = 1000L)
AppOptModeSharedPreferencesUtils.deleteAppOptimizationModeEventByUid(context, UID) AppOptModeSharedPreferencesUtils.deleteAppOptimizationModeEventByUid(context, UID)
@@ -100,20 +112,32 @@ class AppOptModeSharedPreferencesUtilsTest {
@Test @Test
fun resetExpiredAppOptModeBeforeTimestamp_noExpiredData_verifyData() { fun resetExpiredAppOptModeBeforeTimestamp_noExpiredData_verifyData() {
insertAppOptModeEventForTest(/* expirationTime= */ 1000L) insertAppOptModeEventForTest(expirationTime = 1000L)
AppOptModeSharedPreferencesUtils.resetExpiredAppOptModeBeforeTimestamp(context, 999L) AppOptModeSharedPreferencesUtils.resetExpiredAppOptModeBeforeTimestamp(
context,
queryTimestampMs = 999L
)
val events = AppOptModeSharedPreferencesUtils.getAllEvents(context) val events = AppOptModeSharedPreferencesUtils.getAllEvents(context)
assertThat(events.size).isEqualTo(1) assertThat(events).hasSize(1)
assertAppOptimizationModeEventInfo(events.get(0), UID, PACKAGE_NAME, MODE_OPTIMIZED, 1000L) assertAppOptimizationModeEventInfo(
events[0],
UID,
PACKAGE_NAME,
MODE_OPTIMIZED,
expirationTime = 1000L
)
} }
@Test @Test
fun resetExpiredAppOptModeBeforeTimestamp_hasExpiredData_verifyEmptyList() { fun resetExpiredAppOptModeBeforeTimestamp_hasExpiredData_verifyEmptyList() {
insertAppOptModeEventForTest(/* expirationTime= */ 1000L) insertAppOptModeEventForTest(expirationTime = 1000L)
AppOptModeSharedPreferencesUtils.resetExpiredAppOptModeBeforeTimestamp(context, 1001L) AppOptModeSharedPreferencesUtils.resetExpiredAppOptModeBeforeTimestamp(
context,
queryTimestampMs = 1001L
)
assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty() assertThat(AppOptModeSharedPreferencesUtils.getAllEvents(context)).isEmpty()
} }
@@ -185,7 +209,7 @@ class AppOptModeSharedPreferencesUtilsTest {
mutableListOf(UID), mutableListOf(UID),
mutableListOf(PACKAGE_NAME), mutableListOf(PACKAGE_NAME),
mutableListOf(MODE_OPTIMIZED), mutableListOf(MODE_OPTIMIZED),
longArrayOf(expirationTime) longArrayOf(expirationTime),
) { _: Int, _: String -> ) { _: Int, _: String ->
testBatteryOptimizeUtils testBatteryOptimizeUtils
} }