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

Commit 8db814a4 authored by Jeremy Meyer's avatar Jeremy Meyer
Browse files

Make resources get package updates for all users 

Previously when resources registered its package monitor for package
updates it wasn't passing a UserHandle so it was only getting updates
for the system user. This has caused various RRO issues when apps were
installed or updated. With this change we request updates for all users
which fixes some of the major issues we have seen.

Fixes: 306097922
Test: running `atest com.google.android.carui.ats.AtsCarUiDeviceTest`
Change-Id: I3019614a15492910d06107489cd03ecf75360baf
parent fb35a600

core/tests/overlaytests/device_non_system/Android.bp

0 → 100644
+39 −0
Original line number Diff line number Diff line 
// Copyright (C) 2024 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

}



android_test {

    name: "OverlayDeviceTestsNonSystem",

    team: "trendy_team_android_resources",

    srcs: ["src/**/*.java"],

    platform_apis: true,

    certificate: "platform",

    static_libs: [

        "androidx.test.rules",

        "testng",

        "compatibility-device-util-axt",

    ],

    test_suites: ["device-tests"],

    data: [

        ":OverlayDeviceTestsNonSystem_AppOverlay",

    ],

}

core/tests/overlaytests/device_non_system/AndroidManifest.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.overlaytest.non_system">



    <uses-sdk android:minSdkVersion="34" />



    <application>

        <uses-library android:name="android.test.runner"/>

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.overlaytest.non_system"

        android:label="Runtime resource overlay tests for non system app" />

</manifest>

core/tests/overlaytests/device_non_system/AndroidTest.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<configuration description="Test module config for OverlayDeviceTestsNonSystem">

    <option name="test-tag" value="OverlayDeviceTestsNonSystem" />

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />



    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="OverlayDeviceTestsNonSystem_AppOverlay.apk" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RunOnSecondaryUserTargetPreparer">

        <option name="test-package-name" value="com.android.overlaytest.non_system" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="test-user-token" value="%TEST_USER%"/>

        <option name="run-command"

            value="cmd overlay enable --user %TEST_USER% com.android.overlaytest.non_system.app_overlay" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="OverlayDeviceTestsNonSystem.apk" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.AndroidJUnitTest">

        <option name="package" value="com.android.overlaytest.non_system" />

    </test>

</configuration>

core/tests/overlaytests/device_non_system/res/layout/layout.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <TextView

        android:id="@+id/text_view_id"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:text="@string/test_string" />

</LinearLayout>
 
 No newline at end of file

core/tests/overlaytests/device_non_system/res/values/overlayable.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<resources>

    <overlayable name="TestResources">

        <policy type="public">

            <item type="string" name="test_string" />

        </policy>

    </overlayable>

</resources>
 
 No newline at end of file