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

Commit 0cbfd2b1 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Allow activities/services to have app loaders 

When a service or activity attaches to a base context, add the
loaders from the application context to the base context. Activity
and service contexts are created before creating the Application
context, so in order to add the app loaders before the component
onCreate method is called, we must add the app loaders to the
component after the app has been initialized.

Bug: 148630842
Test: launch AppResourcesLoaders
Change-Id: I44aa718779c574094590d25fd839f1d9f9134edb
parent cb2d2ec7

core/java/android/app/ActivityThread.java

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

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.content.res.Resources.Theme;

import android.content.res.loader.ResourcesLoader;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDebug;

import android.database.sqlite.SQLiteDebug;

import android.database.sqlite.SQLiteDebug.DbStats;

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

                    r.mPendingRemoveWindow = null;

                    r.mPendingRemoveWindowManager = 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);

                appContext.setOuterContext(activity);

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

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

                        r.ident, app, r.intent, r.activityInfo, title, r.parent,

                        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();

            java.lang.ClassLoader cl = packageInfo.getClassLoader();

            service = packageInfo.getAppFactory()

            service = packageInfo.getAppFactory()

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

                    .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);

            context.setOuterContext(service);

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

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

                    ActivityManager.getService());

                    ActivityManager.getService());

tests/AppResourcesLoaders/Android.bp

0 → 100644
+22 −0
Original line number Original line 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 Original line 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 Original line 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 Original line 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>