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

Commit c4f2beba authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Ryan Mitchell
Browse files

Relax restrictions on non-system overlays 

Allow installation of overlays to /data, but only if the overlay is
platform signed, or the overlay targets SDK Q or later.

Bug: 121016681
Test: atest CtsAppSecurityHostTestCases:OverlayHostTest OverlayDeviceTests OverlayHostTests
Change-Id: I63df9e7c4714f4c3aad861b1fb76cf8eb891c29d
parent 0d609de6

core/tests/overlaytests/device/test-apps/AppOverlayOne/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayOne

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/device/test-apps/AppOverlayOne/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
        android:versionCode="1"

        android:versionName="1.0">

        <application android:hasCode="false" />

        <overlay android:targetPackage="com.android.overlaytest" android:priority="1" />

        <overlay android:targetPackage="com.android.overlaytest" />

</manifest>

core/tests/overlaytests/device/test-apps/AppOverlayTwo/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_PACKAGE_NAME := OverlayDeviceTests_AppOverlayTwo

LOCAL_SDK_VERSION := current

LOCAL_COMPATIBILITY_SUITE := device-tests

LOCAL_CERTIFICATE := platform

LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --no-resource-removal

include $(BUILD_PACKAGE)

core/tests/overlaytests/device/test-apps/AppOverlayTwo/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
        android:versionCode="1"

        android:versionName="1.0">

        <application android:hasCode="false" />

        <overlay android:targetPackage="com.android.overlaytest" android:priority="2" />

        <overlay android:targetPackage="com.android.overlaytest" />

</manifest>

core/tests/overlaytests/host/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ LOCAL_MODULE := OverlayHostTests 
LOCAL_JAVA_LIBRARIES := tradefed

LOCAL_COMPATIBILITY_SUITE := general-tests

LOCAL_TARGET_REQUIRED_MODULES := \

    OverlayHostTests_BadSignatureOverlay \

    OverlayHostTests_NonPlatformSignatureOverlay \

    OverlayHostTests_PlatformSignatureStaticOverlay \

    OverlayHostTests_PlatformSignatureOverlay \

    OverlayHostTests_UpdateOverlay \