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

Commit 7328514f authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Rewrite R constants before creating Application 

An app accessing R constants in the constructor of its Application
must be able to use resources from shared libraries that it uses.
This changes moves onResourcesLoaded to be invoked before creating
the Application.

Bug: 147686280
Test: adb shell am start-activity \
    com.android.phone/com.android.phone.CallFeaturesSetting

Change-Id: I574f144bf983080cef43fc79dbc4814266586d2d
parent 4c1b1ff6

core/java/android/app/LoadedApk.java

+14 −14
Original line number Diff line number Diff line
@@ -1178,13 +1178,26 @@ public final class LoadedApk { 
        }



        try {

            java.lang.ClassLoader cl = getClassLoader();

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

            if (!mPackageName.equals("android")) {

                Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                        "initializeJavaContextClassLoader");

                initializeJavaContextClassLoader();

                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

            }



            // Rewrite the R 'constants' for all library apks.

            SparseArray<String> packageIdentifiers = getAssets().getAssignedPackageIdentifiers(

                    false, false);

            for (int i = 0, n = packageIdentifiers.size(); i < n; i++) {

                final int id = packageIdentifiers.keyAt(i);

                if (id == 0x01 || id == 0x7f) {

                    continue;

                }



                rewriteRValues(cl, packageIdentifiers.valueAt(i), id);

            }



            ContextImpl appContext = ContextImpl.createAppContext(mActivityThread, this);

            app = mActivityThread.mInstrumentation.newApplication(

                    cl, appClass, appContext);
@@ -1213,19 +1226,6 @@ public final class LoadedApk { 
            }

        }



        // Rewrite the R 'constants' for all library apks.

        SparseArray<String> packageIdentifiers = getAssets().getAssignedPackageIdentifiers(

                false, false);

        final int N = packageIdentifiers.size();

        for (int i = 0; i < N; i++) {

            final int id = packageIdentifiers.keyAt(i);

            if (id == 0x01 || id == 0x7f) {

                continue;

            }



            rewriteRValues(getClassLoader(), packageIdentifiers.valueAt(i), id);

        }



        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);



        return app;