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

Commit d9494cc7 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Revert "Revert "Fix InstallOverlayTests fail to install... 

Merge "Merge "Revert "Revert "Fix InstallOverlayTests fail to install overlay""" into rvc-dev-plus-aosp am: 05470139" into rvc-d1-dev-plus-aosp
parents ce97acab e8dd850a

core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java

+7 −8
Original line number Diff line number Diff line
@@ -78,14 +78,9 @@ public class InstallOverlayTests extends BaseHostJUnit4Test { 
    }



    @Test

    public void failToInstallPlatformSignedStaticOverlay() throws Exception {

        try {

    public void installedIsStaticOverlayIsMutable() throws Exception {

        installPackage("OverlayHostTests_PlatformSignatureStaticOverlay.apk");

            fail("installed a static overlay");

        } catch (Exception e) {

            // Expected.

        }

        assertFalse(overlayManagerContainsPackage(SIG_OVERLAY_PACKAGE_NAME));

        assertTrue(isOverlayMutable(SIG_OVERLAY_PACKAGE_NAME));

    }



    @Test
@@ -229,6 +224,10 @@ public class InstallOverlayTests extends BaseHostJUnit4Test { 
        return shell("cmd overlay list").contains(pkg);

    }



    private boolean isOverlayMutable(String pkg) throws Exception {

        return shell("cmd overlay dump ismutable " + pkg).contains("true");

    }



    private String shell(final String cmd) throws Exception {

        return getDevice().executeShellCommand(cmd);

    }

core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk

+4 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_NonPlatformSignatureOverlay

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_bad

include $(BUILD_PACKAGE)
@@ -28,7 +28,8 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_PlatformSignatureStaticOverlay

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_MANIFEST_FILE := static/AndroidManifest.xml

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_static

include $(BUILD_PACKAGE)
@@ -37,7 +38,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_PlatformSignatureOverlay

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1

LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1

core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_PACKAGE_NAME := OverlayHostTests_UpdateOverlay

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal
@@ -31,7 +31,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_FrameworkOverlayV1

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1

LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1
@@ -43,7 +43,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_FrameworkOverlayV2

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v2

LOCAL_AAPT_FLAGS += --version-code 2 --version-name v2
@@ -57,7 +57,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_AppOverlayV1

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v1

LOCAL_AAPT_FLAGS += --version-code 1 --version-name v1

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/v1/res
@@ -68,7 +68,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE_TAGS := tests

LOCAL_PACKAGE_NAME := OverlayHostTests_AppOverlayV2

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_AAPT_FLAGS := --custom-package $(my_package_prefix)_v2

LOCAL_AAPT_FLAGS += --version-code 2 --version-name v2

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/app/v2/res

services/tests/servicestests/src/com/android/server/om/OverlayManagerServiceImplTestsBase.java

+1 −2
Original line number Diff line number Diff line
@@ -377,8 +377,7 @@ class OverlayManagerServiceImplTestsBase { 
                return false;

            }

            final String key = createKey(overlayPackage.packageName, userId);

            mIdmapFiles.add(key);

            return true;

            return mIdmapFiles.add(key);

        }



        @Override