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

Merge "Apply dynamic deny list into data usage state" into main

Browse Source
This commit is contained in:
Wesley Wang
2023-11-15 12:53:25 +00:00
committed by Android (Google) Code Review
parent 093cde0538 f0b67ef0f9
commit 2dec2b2785
8 changed files with 432 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
View File

@@ -239,6 +239,7 @@ public class AppDataUsageTest {
ReflectionHelpers.setField(mFragment, "mUnrestrictedData", unrestrictedDataPref);
ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
ReflectionHelpers.setField(mFragment.services, "mPolicyManager", networkPolicyManager);
ReflectionHelpers.setField(mFragment, "mContext", RuntimeEnvironment.application);
when(mFragment.getListView()).thenReturn(mock(RecyclerView.class));
ShadowRestrictedLockUtilsInternal.setRestricted(true);

309
tests/robotests/src/com/android/settings/fuelgauge/datasaver/DynamicDenylistManagerTest.java
View File

@@ -19,138 +19,373 @@ package com.android.settings.fuelgauge.datasaver;
import static android.net.NetworkPolicyManager.POLICY_NONE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import static com.android.settings.fuelgauge.datasaver.DynamicDenylistManager.PREF_KEY_MANUAL_DENYLIST_SYNCED;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.net.NetworkPolicyManager;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import java.util.Collections;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class DynamicDenylistManagerTest {
private static final String FAKE_UID_1 = "package_uid_1";
private static final String FAKE_UID_2 = "package_uid_2";
private static final int[] EMPTY_ARRAY = new int[]{};
private static final String FAKE_UID_1 = "1001";
private static final String FAKE_UID_2 = "1002";
private static final int FAKE_UID_1_INT = Integer.parseInt(FAKE_UID_1);
private static final int FAKE_UID_2_INT = Integer.parseInt(FAKE_UID_2);
private SharedPreferences mManualDenyListPref;
private SharedPreferences mDynamicDenyListPref;
private DynamicDenylistManager mDynamicDenylistManager;
private Context mContext;
@Mock
private NetworkPolicyManager mNetworkPolicyManager;
@Mock
private PackageManager mPackageManager;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application.getApplicationContext();
mDynamicDenylistManager = new DynamicDenylistManager(mContext);
mManualDenyListPref = mDynamicDenylistManager.getManualDenylistPref();
mDynamicDenyListPref = mDynamicDenylistManager.getDynamicDenylistPref();
MockitoAnnotations.initMocks(this);
}
@After
public void tearDown() {
mDynamicDenylistManager.clearManualDenylistPref();
mDynamicDenylistManager.clearDynamicDenylistPref();
mDynamicDenylistManager.clearSharedPreferences();
}
@Test
public void getManualDenylistPref_isEmpty() {
assertThat(mManualDenyListPref.getAll()).isEmpty();
public void init_withoutExistedRejectPolicy_createWithExpectedValue() {
initDynamicDenylistManager(EMPTY_ARRAY);
assertThat(mManualDenyListPref.getAll()).hasSize(1);
assertTrue(mManualDenyListPref.contains(PREF_KEY_MANUAL_DENYLIST_SYNCED));
}
@Test
public void getDynamicDenylistPref_isEmpty() {
assertThat(mDynamicDenyListPref.getAll()).isEmpty();
public void init_withExistedRejectPolicy_createWithExpectedValue() {
initDynamicDenylistManager(new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
assertThat(mManualDenyListPref.getAll()).hasSize(3);
assertTrue(mManualDenyListPref.contains(PREF_KEY_MANUAL_DENYLIST_SYNCED));
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
assertTrue(mManualDenyListPref.contains(FAKE_UID_2));
}
@Test
public void getManualDenylistPref_initiated_containsExpectedValue() {
mManualDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mManualDenyListPref, FAKE_UID_1);
assertThat(mManualDenyListPref.getAll().size()).isEqualTo(1);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
}
@Test
public void getDynamicDenylistPref_initiated_containsExpectedValue() {
mDynamicDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mDynamicDenyListPref, FAKE_UID_1);
assertThat(mDynamicDenyListPref.getAll()).hasSize(1);
assertTrue(mDynamicDenyListPref.contains(FAKE_UID_1));
}
@Test
public void updateManualDenylist_policyReject_addsUid() {
mDynamicDenylistManager.updateManualDenylist(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND);
initDynamicDenylistManager(EMPTY_ARRAY);
mDynamicDenylistManager.updateDenylistPref(FAKE_UID_1_INT,
POLICY_REJECT_METERED_BACKGROUND);
assertThat(mManualDenyListPref.getAll()).hasSize(1);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
}
@Test
public void updateManualDenylist_policyNone_removesUid() {
mManualDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mManualDenyListPref, FAKE_UID_1);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
mDynamicDenylistManager.updateManualDenylist(FAKE_UID_1, POLICY_NONE);
mDynamicDenylistManager.updateDenylistPref(FAKE_UID_1_INT, POLICY_NONE);
assertThat(mManualDenyListPref.getAll()).isEmpty();
assertFalse(mManualDenyListPref.contains(FAKE_UID_1));
}
@Test
public void updateManualDenylist_samePolicy_doNothing() {
mManualDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mManualDenyListPref, FAKE_UID_1);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
assertThat(mManualDenyListPref.getAll()).hasSize(2);
mDynamicDenylistManager.updateManualDenylist(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND);
mDynamicDenylistManager.updateDenylistPref(FAKE_UID_1_INT,
POLICY_REJECT_METERED_BACKGROUND);
assertThat(mManualDenyListPref.getAll()).hasSize(1);
assertThat(mManualDenyListPref.getAll()).hasSize(2);
}
@Test
public void isManualDenylist_returnsFalse() {
assertFalse(mDynamicDenylistManager.isInManualDenylist(FAKE_UID_1));
public void setUidPolicyLocked_invokeSetUidPolicy() {
initDynamicDenylistManager(EMPTY_ARRAY);
mDynamicDenylistManager.setUidPolicyLocked(FAKE_UID_1_INT,
POLICY_REJECT_METERED_BACKGROUND);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
verify(mNetworkPolicyManager).setUidPolicy(eq(FAKE_UID_1_INT),
eq(POLICY_REJECT_METERED_BACKGROUND));
}
@Test
public void isManualDenylist_incorrectUid_returnsFalse() {
public void setDenylist_emptyListAndNoData_doNothing() {
initDynamicDenylistManager(EMPTY_ARRAY);
mDynamicDenylistManager.setDenylist(Collections.emptyList());
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), anyInt());
}
@Test
public void setDenylist_uidDeniedAlready_doNothing()
throws PackageManager.NameNotFoundException {
when(mPackageManager.getPackageUid(anyString(), eq(0))).thenReturn(FAKE_UID_1_INT);
initDynamicDenylistManager(new int[]{FAKE_UID_1_INT});
mDynamicDenylistManager.setDenylist(List.of(FAKE_UID_1));
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), anyInt());
}
@Test
public void setDenylist_sameList_doNothing() throws PackageManager.NameNotFoundException {
when(mPackageManager.getPackageUid(eq(FAKE_UID_1), eq(0))).thenReturn(FAKE_UID_1_INT);
when(mPackageManager.getPackageUid(eq(FAKE_UID_2), eq(0))).thenReturn(FAKE_UID_2_INT);
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mDynamicDenyListPref, FAKE_UID_2, FAKE_UID_1);
mDynamicDenylistManager.setDenylist(List.of(FAKE_UID_1, FAKE_UID_2));
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), anyInt());
}
@Test
public void setDenylist_newListWithOldData_modifyPolicyNoneAndReject()
throws PackageManager.NameNotFoundException {
when(mPackageManager.getPackageUid(anyString(), eq(0))).thenReturn(
Integer.parseInt(FAKE_UID_1));
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mDynamicDenyListPref, FAKE_UID_2);
mDynamicDenylistManager.setDenylist(List.of(FAKE_UID_1));
verify(mNetworkPolicyManager).setUidPolicy(FAKE_UID_2_INT, POLICY_NONE);
verify(mNetworkPolicyManager).setUidPolicy(FAKE_UID_1_INT,
POLICY_REJECT_METERED_BACKGROUND);
assertThat(mDynamicDenyListPref.getAll()).hasSize(1);
assertTrue(mDynamicDenyListPref.contains(FAKE_UID_1));
}
@Test
public void setDenylist_newListWithoutOldData_modifyPolicyReject()
throws PackageManager.NameNotFoundException {
when(mPackageManager.getPackageUid(anyString(), eq(0))).thenReturn(
Integer.parseInt(FAKE_UID_1));
initDynamicDenylistManager(EMPTY_ARRAY);
mDynamicDenylistManager.setDenylist(List.of(FAKE_UID_1));
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), eq(POLICY_NONE));
verify(mNetworkPolicyManager).setUidPolicy(FAKE_UID_1_INT,
POLICY_REJECT_METERED_BACKGROUND);
assertThat(mDynamicDenyListPref.getAll()).hasSize(1);
assertTrue(mDynamicDenyListPref.contains(FAKE_UID_1));
}
@Test
public void setDenylist_emptyListWithOldData_modifyPolicyNone() {
initDynamicDenylistManager(EMPTY_ARRAY);
setupPreference(mDynamicDenyListPref, FAKE_UID_2);
mDynamicDenylistManager.setDenylist(Collections.emptyList());
verify(mNetworkPolicyManager).setUidPolicy(FAKE_UID_2_INT, POLICY_NONE);
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(),
eq(POLICY_REJECT_METERED_BACKGROUND));
assertThat(mDynamicDenyListPref.getAll()).isEmpty();
}
@Test
public void isInManualDenylist_returnsFalse() {
initDynamicDenylistManager(EMPTY_ARRAY);
assertFalse(mDynamicDenylistManager.isInManualDenylist(FAKE_UID_1_INT));
}
@Test
public void isInManualDenylist_incorrectUid_returnsFalse() {
initDynamicDenylistManager(EMPTY_ARRAY);
mManualDenyListPref.edit().putInt(FAKE_UID_2, POLICY_REJECT_METERED_BACKGROUND).apply();
assertFalse(mDynamicDenylistManager.isInManualDenylist(FAKE_UID_1));
assertFalse(mDynamicDenylistManager.isInManualDenylist(FAKE_UID_1_INT));
}
@Test
public void isManualDenylist_initiated_returnsTrue() {
public void isInManualDenylist_initiated_returnsTrue() {
initDynamicDenylistManager(EMPTY_ARRAY);
mManualDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
assertTrue(mDynamicDenylistManager.isInManualDenylist(FAKE_UID_1));
assertTrue(mDynamicDenylistManager.isInManualDenylist(FAKE_UID_1_INT));
}
@Test
public void clearManualDenylistPref_isEmpty() {
mManualDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
public void resetDenylistIfNeeded_nullPackageName_doNothing() {
initDynamicDenylistManager(new int[0], new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded(null, false);
assertThat(mManualDenyListPref.getAll()).hasSize(1);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
mDynamicDenylistManager.clearManualDenylistPref();
@Test
public void resetDenylistIfNeeded_invalidPackageName_doNothing() {
initDynamicDenylistManager(new int[0], new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded("invalid_package_name", false);
assertThat(mManualDenyListPref.getAll()).hasSize(1);
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
@Test
public void resetDenylistIfNeeded_denylistUnchanged_doNothingWithPolicy() {
initDynamicDenylistManager(new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded(SETTINGS_PACKAGE_NAME, false);
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
@Test
public void resetDenylistIfNeeded_denylistChanged_resetAndClear() {
initDynamicDenylistManager(new int[0], new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded(SETTINGS_PACKAGE_NAME, false);
assertThat(mManualDenyListPref.getAll()).isEmpty();
verify(mNetworkPolicyManager, times(2)).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
@Test
public void resetDenylistIfNeeded_forceResetWithNullPackageName_resetAndClear() {
initDynamicDenylistManager(new int[0], new int[]{FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded(null, true);
assertThat(mManualDenyListPref.getAll()).isEmpty();
verify(mNetworkPolicyManager).setUidPolicy(eq(FAKE_UID_2_INT), eq(POLICY_NONE));
}
@Test// 4
public void resetDenylistIfNeeded_forceResetWithInvalidPackageName_resetAndClear() {
initDynamicDenylistManager(new int[0], new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded("invalid_package_name", true);
assertThat(mManualDenyListPref.getAll()).isEmpty();
verify(mNetworkPolicyManager, times(2)).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
@Test
public void resetDenylistIfNeeded_forceResetButDenylistUnchanged_doNothingWithPolicy() {
initDynamicDenylistManager(new int[]{FAKE_UID_1_INT});
mDynamicDenylistManager.resetDenylistIfNeeded(SETTINGS_PACKAGE_NAME, true);
assertThat(mManualDenyListPref.getAll()).isEmpty();
verify(mNetworkPolicyManager, never()).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
@Test
public void resetDenylistIfNeeded_forceResetWithDenylistChanged_resetAndClear() {
initDynamicDenylistManager(new int[0], new int[]{FAKE_UID_1_INT, FAKE_UID_2_INT});
mDynamicDenylistManager.resetDenylistIfNeeded(SETTINGS_PACKAGE_NAME, true);
assertThat(mManualDenyListPref.getAll()).isEmpty();
verify(mNetworkPolicyManager, times(2)).setUidPolicy(anyInt(), eq(POLICY_NONE));
}
@Test
public void clearSharedPreferences_manualDenyListPrefIsEmpty() {
initDynamicDenylistManager(EMPTY_ARRAY);
mManualDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
assertThat(mManualDenyListPref.getAll()).hasSize(2);
assertTrue(mManualDenyListPref.contains(FAKE_UID_1));
assertTrue(mManualDenyListPref.contains(PREF_KEY_MANUAL_DENYLIST_SYNCED));
mDynamicDenylistManager.clearSharedPreferences();
assertThat(mManualDenyListPref.getAll()).isEmpty();
}
@Test
public void clearDynamicDenylistPref_isEmpty() {
public void clearSharedPreferences_dynamicDenyListPrefIsEmpty() {
initDynamicDenylistManager(EMPTY_ARRAY);
mDynamicDenyListPref.edit().putInt(FAKE_UID_1, POLICY_REJECT_METERED_BACKGROUND).apply();
assertThat(mDynamicDenyListPref.getAll()).hasSize(1);
assertTrue(mDynamicDenyListPref.contains(FAKE_UID_1));
mDynamicDenylistManager.clearDynamicDenylistPref();
mDynamicDenylistManager.clearSharedPreferences();
assertThat(mDynamicDenyListPref.getAll()).isEmpty();
}
private void initDynamicDenylistManager(int[] preload) {
initDynamicDenylistManager(preload, preload);
}
private void initDynamicDenylistManager(int[] preload1, int[] preload2) {
final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
when(context.getApplicationContext()).thenReturn(context);
when(context.getPackageManager()).thenReturn(mPackageManager);
when(mNetworkPolicyManager.getUidsWithPolicy(anyInt()))
.thenReturn(preload1).thenReturn(preload2);
mDynamicDenylistManager = new DynamicDenylistManager(context, mNetworkPolicyManager);
mManualDenyListPref = mDynamicDenylistManager.getManualDenylistPref();
mDynamicDenyListPref = mDynamicDenylistManager.getDynamicDenylistPref();
}
private void setupPreference(SharedPreferences sharedPreferences, String... uids) {
for (String uid : uids) {
sharedPreferences.edit().putInt(uid, POLICY_REJECT_METERED_BACKGROUND).apply();
}
}
}