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

Merge "Split ChangeReason and decouple it from Observer" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-30 02:33:11 +00:00
committed by Android (Google) Code Review
parent 42508ae03d c725c5ba5a
commit 7a0d5b98e8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
View File

@@ -33,7 +33,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action; import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
import com.android.settingslib.datastore.ChangeReason; import com.android.settingslib.datastore.DataChangeReason;
import com.android.settingslib.fuelgauge.PowerAllowlistBackend; import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@@ -225,7 +225,7 @@ public class BatteryOptimizeUtils {
// App preferences are already clear when code reach here, and there may be no // App preferences are already clear when code reach here, and there may be no
// setAppUsageStateInternal call to notifyChange. So always trigger notifyChange here. // setAppUsageStateInternal call to notifyChange. So always trigger notifyChange here.
BatterySettingsStorage.get(context).notifyChange(ChangeReason.DELETE); BatterySettingsStorage.get(context).notifyChange(DataChangeReason.DELETE);
allowlistBackend.refreshList(); allowlistBackend.refreshList();
// Resets optimization mode for each application. // Resets optimization mode for each application.
@@ -371,7 +371,7 @@ public class BatteryOptimizeUtils {
getAppOptimizationMode(appStandbyMode, allowListed)); getAppOptimizationMode(appStandbyMode, allowListed));
} }
private static @ChangeReason int toChangeReason(Action action) { private static @DataChangeReason int toChangeReason(Action action) {
return action == Action.RESTORE ? ChangeReason.RESTORE : ChangeReason.UPDATE; return action == Action.RESTORE ? DataChangeReason.RESTORE : DataChangeReason.UPDATE;
} }
} }

14
tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
View File

@@ -49,7 +49,7 @@ import android.os.UserManager;
import android.util.ArraySet; import android.util.ArraySet;
import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action; import com.android.settings.fuelgauge.BatteryOptimizeHistoricalLogEntry.Action;
import com.android.settingslib.datastore.ChangeReason; import com.android.settingslib.datastore.DataChangeReason;
import com.android.settingslib.datastore.Observer; import com.android.settingslib.datastore.Observer;
import com.android.settingslib.fuelgauge.PowerAllowlistBackend; import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
@@ -164,7 +164,7 @@ public class BatteryOptimizeUtilsTest {
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false); verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.UPDATE); verify(mObserver).onChanged(DataChangeReason.UPDATE);
} }
@Test @Test
@@ -178,7 +178,7 @@ public class BatteryOptimizeUtilsTest {
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true); verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
verify(mObserver).onChanged(ChangeReason.UPDATE); verify(mObserver).onChanged(DataChangeReason.UPDATE);
} }
@Test @Test
@@ -192,7 +192,7 @@ public class BatteryOptimizeUtilsTest {
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false); verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.UPDATE); verify(mObserver).onChanged(DataChangeReason.UPDATE);
} }
@Test @Test
@@ -300,7 +300,7 @@ public class BatteryOptimizeUtilsTest {
inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID); inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME); inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
verifyNoMoreInteractions(mMockBackend); verifyNoMoreInteractions(mMockBackend);
verify(mObserver).onChanged(ChangeReason.DELETE); verify(mObserver).onChanged(DataChangeReason.DELETE);
} }
@Test @Test
@@ -311,7 +311,7 @@ public class BatteryOptimizeUtilsTest {
/* isSystemOrDefaultApp */ false); /* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false); verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.DELETE); verify(mObserver).onChanged(DataChangeReason.DELETE);
} }
@Test @Test
@@ -322,7 +322,7 @@ public class BatteryOptimizeUtilsTest {
/* isSystemOrDefaultApp */ false); /* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false); verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.DELETE); verify(mObserver).onChanged(DataChangeReason.DELETE);
} }
private void runTestForResetWithMode( private void runTestForResetWithMode(