Merge "Add a protection for the null UID corner case" into main

2024-02-15 14:09:34 +00:00
parent 44f2967454 15e853a1b9
commit 73b273d781
2 changed files with 12 additions and 4 deletions
--- a/tests/robotests/src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManagerTest.java
@@ -177,8 +177,11 @@ public class DynamicDenylistManagerTest {
    @Test
    public void setDenylist_uidDeniedAlready_doNothing() {
        initDynamicDenylistManager(new int[] {FAKE_UID_1_INT});
+        final ArraySet uids = new ArraySet<>();
+        uids.add(FAKE_UID_1_INT);
+        uids.add(null);

-        setDenylist(new ArraySet<>(List.of(FAKE_UID_1_INT)));
+        setDenylist(uids);

        verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), anyInt());
    }