Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfdea40d authored by Chan Kim's avatar Chan Kim Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: 58a0f136 am: 2b6a1ae7 am: 0d85585d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2718256



Change-Id: I3caf7643638a74d034ca380113733575bdcff64f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ebfc02f 0d85585d

services/tests/servicestests/src/com/android/server/CertBlacklisterTest.java

+3 −3
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ import libcore.io.IoUtils; 
 */

public class CertBlacklisterTest extends AndroidTestCase {



    private static final String BLACKLIST_ROOT = System.getenv("ANDROID_DATA") + "/misc/keychain/";

    private static final String DENYLIST_ROOT = System.getenv("ANDROID_DATA") + "/misc/keychain/";



    public static final String PUBKEY_PATH = BLACKLIST_ROOT + "pubkey_blacklist.txt";

    public static final String SERIAL_PATH = BLACKLIST_ROOT + "serial_blacklist.txt";

    public static final String PUBKEY_PATH = DENYLIST_ROOT + "pubkey_blacklist.txt";

    public static final String SERIAL_PATH = DENYLIST_ROOT + "serial_blacklist.txt";



    public static final String PUBKEY_KEY = "pubkey_blacklist";

    public static final String SERIAL_KEY = "serial_blacklist";

services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java

+16 −16
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void updateRuleSet_notSystemApp() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp(false);

        Rule rule =

                new Rule(
@@ -237,7 +237,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void updateRuleSet_authorized() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        Rule rule =

                new Rule(
@@ -251,7 +251,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void updateRuleSet_correctMethodCall() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        IntentSender mockReceiver = mock(IntentSender.class);

        List<Rule> rules =
@@ -271,7 +271,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void updateRuleSet_fail() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        doThrow(new IOException()).when(mIntegrityFileManager).writeRules(any(), any(), any());

        IntentSender mockReceiver = mock(IntentSender.class);
@@ -292,7 +292,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void broadcastReceiverRegistration() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        ArgumentCaptor<IntentFilter> intentFilterCaptor =

                ArgumentCaptor.forClass(IntentFilter.class);
@@ -308,7 +308,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void handleBroadcast_correctArgs() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =

                ArgumentCaptor.forClass(BroadcastReceiver.class);
@@ -345,7 +345,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void handleBroadcast_correctArgs_multipleCerts() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =

                ArgumentCaptor.forClass(BroadcastReceiver.class);
@@ -368,7 +368,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void handleBroadcast_correctArgs_sourceStamp() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =

                ArgumentCaptor.forClass(BroadcastReceiver.class);
@@ -393,7 +393,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void handleBroadcast_allow() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =

                ArgumentCaptor.forClass(BroadcastReceiver.class);
@@ -412,7 +412,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void handleBroadcast_reject() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =

                ArgumentCaptor.forClass(BroadcastReceiver.class);
@@ -438,7 +438,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void handleBroadcast_notInitialized() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        when(mIntegrityFileManager.initialized()).thenReturn(false);

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =
@@ -459,7 +459,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void verifierAsInstaller_skipIntegrityVerification() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        setIntegrityCheckIncludesRuleProvider(false);

        ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor =
@@ -480,7 +480,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void getCurrentRules() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();

        Rule rule = new Rule(IntegrityFormula.Application.packageNameEquals("package"), Rule.DENY);

        when(mIntegrityFileManager.readRules(any())).thenReturn(Arrays.asList(rule));
@@ -490,7 +490,7 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void getWhitelistedRuleProviders_returnsEmptyForNonSystemApps() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp(false);



        assertThat(mService.getWhitelistedRuleProviders()).isEmpty();
@@ -498,13 +498,13 @@ public class AppIntegrityManagerServiceImplTest { 


    @Test

    public void getWhitelistedRuleProviders() throws Exception {

        whitelistUsAsRuleProvider();

        allowlistUsAsRuleProvider();

        makeUsSystemApp();



        assertThat(mService.getWhitelistedRuleProviders()).containsExactly(TEST_FRAMEWORK_PACKAGE);

    }



    private void whitelistUsAsRuleProvider() {

    private void allowlistUsAsRuleProvider() {

        Resources mockResources = mock(Resources.class);

        when(mockResources.getStringArray(R.array.config_integrityRuleProviderPackages))

                .thenReturn(new String[] {TEST_FRAMEWORK_PACKAGE});

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncTaskTest.java

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ public class KeySyncTaskTest { 
        verify(mTestOnlyInsecureCertificateHelper, atLeast(1))

                .isTestOnlyCertificateAlias(eq(TEST_ROOT_CERT_ALIAS));



        // no whitelists check

        // no allowlists check

        verify(mTestOnlyInsecureCertificateHelper, never())

                .doesCredentialSupportInsecureMode(anyInt(), any());

        verify(mTestOnlyInsecureCertificateHelper, never())

services/tests/servicestests/src/com/android/server/pm/UserSystemPackageInstallerTest.java

+15 −15
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class UserSystemPackageInstallerTest { 
        for (int userId : mRemoveUsers) {

            um.removeUser(userId);

        }

        setUserTypePackageWhitelistMode(mOriginalWhitelistMode);

        setUserTypePackageAllowlistMode(mOriginalWhitelistMode);

    }



    /**
@@ -184,7 +184,7 @@ public class UserSystemPackageInstallerTest { 
            }

        }



        final ArrayMap<String, Long> expectedOutput = getNewPackageToWhitelistedBitSetMap();

        final ArrayMap<String, Long> expectedOutput = getNewPackageToAllowlistedBitSetMap();

        expectedOutput.put("com.android.package1", expectedUserTypeBitSet1);

        expectedOutput.put("com.android.package2", expectedUserTypeBitSet2);

        expectedOutput.put("com.android.package3", expectedUserTypeBitSet3);
@@ -227,7 +227,7 @@ public class UserSystemPackageInstallerTest { 
            }

        };



        final ArrayMap<String, Long> expectedOutput = getNewPackageToWhitelistedBitSetMap();

        final ArrayMap<String, Long> expectedOutput = getNewPackageToAllowlistedBitSetMap();

        expectedOutput.put("com.android.package2", 0L);

        expectedOutput.put("com.android.package3", 0L);

        expectedOutput.put("com.android.package4", 0L);
@@ -340,7 +340,7 @@ public class UserSystemPackageInstallerTest { 
    public void testPackagesForCreateUser_full() {

        final String userTypeToCreate = USER_TYPE_FULL_SECONDARY;

        final long userTypeMask = mUserSystemPackageInstaller.getUserTypeMask(userTypeToCreate);

        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        PackageManager pm = mContext.getPackageManager();



        final SystemConfig sysConfig = new SystemConfigTestClass(true);
@@ -384,7 +384,7 @@ public class UserSystemPackageInstallerTest { 
     */

    @Test

    public void testInstallOverlayPackagesExplicitMode() {

        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);



        final String[] userTypes = new String[]{"type"};

        final long maskOfType = 0b0001L;
@@ -453,49 +453,49 @@ public class UserSystemPackageInstallerTest { 
     */

    @Test

    public void testSetWhitelistEnabledMode() {

        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_DISABLE);

        assertFalse(mUserSystemPackageInstaller.isLogMode());

        assertFalse(mUserSystemPackageInstaller.isEnforceMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertFalse(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_LOG);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_LOG);

        assertTrue(mUserSystemPackageInstaller.isLogMode());

        assertFalse(mUserSystemPackageInstaller.isEnforceMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertFalse(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        assertFalse(mUserSystemPackageInstaller.isLogMode());

        assertTrue(mUserSystemPackageInstaller.isEnforceMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertFalse(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST);

        assertFalse(mUserSystemPackageInstaller.isLogMode());

        assertFalse(mUserSystemPackageInstaller.isEnforceMode());

        assertTrue(mUserSystemPackageInstaller.isImplicitWhitelistMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertFalse(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST_SYSTEM);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST_SYSTEM);

        assertFalse(mUserSystemPackageInstaller.isLogMode());

        assertFalse(mUserSystemPackageInstaller.isEnforceMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode());

        assertTrue(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertFalse(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IGNORE_OTA);

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IGNORE_OTA);

        assertFalse(mUserSystemPackageInstaller.isLogMode());

        assertFalse(mUserSystemPackageInstaller.isEnforceMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistMode());

        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertTrue(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(

        setUserTypePackageAllowlistMode(

                USER_TYPE_PACKAGE_WHITELIST_MODE_LOG | USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        assertTrue(mUserSystemPackageInstaller.isLogMode());

        assertTrue(mUserSystemPackageInstaller.isEnforceMode());
@@ -503,7 +503,7 @@ public class UserSystemPackageInstallerTest { 
        assertFalse(mUserSystemPackageInstaller.isImplicitWhitelistSystemMode());

        assertFalse(mUserSystemPackageInstaller.isIgnoreOtaMode());



        setUserTypePackageWhitelistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST

        setUserTypePackageAllowlistMode(USER_TYPE_PACKAGE_WHITELIST_MODE_IMPLICIT_WHITELIST

                | USER_TYPE_PACKAGE_WHITELIST_MODE_ENFORCE);

        assertFalse(mUserSystemPackageInstaller.isLogMode());

        assertTrue(mUserSystemPackageInstaller.isEnforceMode());
@@ -513,7 +513,7 @@ public class UserSystemPackageInstallerTest { 
    }



    /** Sets the allowlist mode to the desired value via adb's setprop. */

    private void setUserTypePackageWhitelistMode(int mode) {

    private void setUserTypePackageAllowlistMode(int mode) {

        UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());

        try {

            String result = uiDevice.executeShellCommand(String.format("setprop %s %d",
@@ -526,7 +526,7 @@ public class UserSystemPackageInstallerTest { 
    }



    /** @see UserSystemPackageInstaller#mWhitelistedPackagesForUserTypes */

    private ArrayMap<String, Long> getNewPackageToWhitelistedBitSetMap() {

    private ArrayMap<String, Long> getNewPackageToAllowlistedBitSetMap() {

        final ArrayMap<String, Long> pkgBitSetMap = new ArrayMap<>();

        // "android" is always treated as allowlisted for all types, regardless of the xml file.

        pkgBitSetMap.put("android", ~0L);