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

Commit 1aa1d902 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Allow activities/services to have app loaders" into rvc-dev am: b390818c 

Change-Id: I30f3b0ad767681c180448663c263ebfe05e24a23
parents c3f36e8a b390818c

core/java/android/app/ActivityThread.java

+12 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import android.content.res.CompatibilityInfo; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.content.res.loader.ResourcesLoader;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDebug;

import android.database.sqlite.SQLiteDebug.DbStats;
@@ -3283,6 +3284,12 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    r.mPendingRemoveWindow = null;

                    r.mPendingRemoveWindowManager = null;

                }



                // Activity resources must be initialized with the same loaders as the

                // application context.

                appContext.getResources().addLoaders(

                        app.getResources().getLoaders().toArray(new ResourcesLoader[0]));



                appContext.setOuterContext(activity);

                activity.attach(appContext, this, getInstrumentation(), r.token,

                        r.ident, app, r.intent, r.activityInfo, title, r.parent,
@@ -4083,6 +4090,11 @@ public final class ActivityThread extends ClientTransactionHandler { 
            java.lang.ClassLoader cl = packageInfo.getClassLoader();

            service = packageInfo.getAppFactory()

                    .instantiateService(cl, data.info.name, data.intent);

            // Service resources must be initialized with the same loaders as the application

            // context.

            context.getResources().addLoaders(

                    app.getResources().getLoaders().toArray(new ResourcesLoader[0]));



            context.setOuterContext(service);

            service.attach(context, this, data.info.name, data.token, app,

                    ActivityManager.getService());

tests/AppResourcesLoaders/Android.bp

0 → 100644
+22 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 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.

//



android_test {

    name: "AppResourcesLoaders",

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

    sdk_version: "current",

    java_resources: [":AppResourcesLoaders_Overlay"]

}

tests/AppResourcesLoaders/AndroidManifest.xml

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

<!--

  ~ Copyright (C) 2020 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.example.loaders">

    <application android:label="AppResourcesLoaders"

                 android:name=".LoadersApplication">

        <activity android:name=".LoaderActivity">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

        <activity android:name=".LoaderActivityIsolated"

                  android:process="com.android.phone" />

    </application>

</manifest>

tests/AppResourcesLoaders/Overlay/Android.bp

0 → 100644
+19 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 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.

//



android_test_helper_app {

    name: "AppResourcesLoaders_Overlay",

}

tests/AppResourcesLoaders/Overlay/AndroidManifest.xml

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

<!--

  ~ Copyright (C) 2020 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.example.loaders">

    <application android:hasCode="false" />

</manifest>