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

Split ChangeReason and decouple it from Observer

Browse Source 
Observer is flexible to be used for other scenarios.

Bug: 325144964
Test: atest SettingsLibDataStoreTest
Test: atest com.android.settings.fuelgauge
Change-Id: I50c0c6267b29460efa3861e609d64a4d92db7b89
This commit is contained in:
Sunny Shao
2024-05-29 09:55:07 +08:00
parent 9bc1bc3c39
commit c725c5ba5a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 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.fuelgauge.PowerAllowlistBackend;
@@ -164,7 +164,7 @@ public class BatteryOptimizeUtilsTest {
TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.UPDATE);
verify(mObserver).onChanged(DataChangeReason.UPDATE);
}
@Test
@@ -178,7 +178,7 @@ public class BatteryOptimizeUtilsTest {
TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
verify(mObserver).onChanged(ChangeReason.UPDATE);
verify(mObserver).onChanged(DataChangeReason.UPDATE);
}
@Test
@@ -192,7 +192,7 @@ public class BatteryOptimizeUtilsTest {
TimeUnit.SECONDS.sleep(1);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.UPDATE);
verify(mObserver).onChanged(DataChangeReason.UPDATE);
}
@Test
@@ -300,7 +300,7 @@ public class BatteryOptimizeUtilsTest {
inOrder.verify(mMockBackend).isAllowlisted(PACKAGE_NAME, UID);
inOrder.verify(mMockBackend).isSysAllowlisted(PACKAGE_NAME);
verifyNoMoreInteractions(mMockBackend);
verify(mObserver).onChanged(ChangeReason.DELETE);
verify(mObserver).onChanged(DataChangeReason.DELETE);
}
@Test
@@ -311,7 +311,7 @@ public class BatteryOptimizeUtilsTest {
/* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.DELETE);
verify(mObserver).onChanged(DataChangeReason.DELETE);
}
@Test
@@ -322,7 +322,7 @@ public class BatteryOptimizeUtilsTest {
/* isSystemOrDefaultApp */ false);
verifySetAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
verify(mObserver).onChanged(ChangeReason.DELETE);
verify(mObserver).onChanged(DataChangeReason.DELETE);
}
private void runTestForResetWithMode(