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

Commit e713efca authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Fix secondary ABI instrumetion 

When installing an APK that supports multiple ABIs, the ABI installed
can be forced to the secondary ABI [i.e. On devices that support both
32 and 64 bit variants, the 32-bit version can be forced when it's
the secondary ABI.] In this case, instrumenting the class always tried
to use the primary ABI. Instead of blindly using the primary ABI and
dropping the secondary ABI, we propagate both ABIs and make a
decision on which one should be chosen.

Bug: 28406240
Change-Id: I7ebb2fd264d2281912afd30f6d73ccb460f9cf85
parent a7ad6e91

core/java/android/app/ActivityThread.java

+26 −1
Original line number Diff line number Diff line
@@ -4948,6 +4948,31 @@ public final class ActivityThread { 
        }

    }



    /**

     * Returns the correct library directory for the current ABI.

     * <p>

     * If we're dealing with a multi-arch application that has both 32 and 64 bit shared

     * libraries, we might need to choose the secondary depending on what the current

     * runtime's instruction set is.

     */

    private String getInstrumentationLibrary(ApplicationInfo appInfo, InstrumentationInfo insInfo) {

        if (appInfo.primaryCpuAbi != null && appInfo.secondaryCpuAbi != null) {

            // Get the instruction set supported by the secondary ABI. In the presence

            // of a native bridge this might be different than the one secondary ABI used.

            String secondaryIsa =

                    VMRuntime.getInstructionSet(appInfo.secondaryCpuAbi);

            final String secondaryDexCodeIsa =

                    SystemProperties.get("ro.dalvik.vm.isa." + secondaryIsa);

            secondaryIsa = secondaryDexCodeIsa.isEmpty() ? secondaryIsa : secondaryDexCodeIsa;



            final String runtimeIsa = VMRuntime.getRuntime().vmInstructionSet();

            if (runtimeIsa.equals(secondaryIsa)) {

                return insInfo.secondaryNativeLibraryDir;

            }

        }

        return insInfo.nativeLibraryDir;

    }



    private void handleBindApplication(AppBindData data) {

        // Register the UI Thread as a sensitive thread to the runtime.

        VMRuntime.registerSensitiveThread();
@@ -5121,7 +5146,7 @@ public final class ActivityThread { 
            mInstrumentationPackageName = ii.packageName;

            mInstrumentationAppDir = ii.sourceDir;

            mInstrumentationSplitAppDirs = ii.splitSourceDirs;

            mInstrumentationLibDir = ii.nativeLibraryDir;

            mInstrumentationLibDir = getInstrumentationLibrary(data.appInfo, ii);

            mInstrumentedAppDir = data.info.getAppDir();

            mInstrumentedSplitAppDirs = data.info.getSplitAppDirs();

            mInstrumentedLibDir = data.info.getLibDir();

core/java/android/content/pm/InstrumentationInfo.java

+8 −5
Original line number Diff line number Diff line
@@ -66,13 +66,12 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
    /** {@hide} */

    public String credentialProtectedDataDir;



    /**

     * Full path to the directory where the native JNI libraries are stored.

     * 

     * {@hide}

     */

    /** {@hide} Full path to the directory containing primary ABI native libraries. */

    public String nativeLibraryDir;



    /** {@hide} Full path to the directory containing secondary ABI native libraries. */

    public String secondaryNativeLibraryDir;



    /**

     * Specifies whether or not this instrumentation will handle profiling.

     */
@@ -95,6 +94,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
        deviceProtectedDataDir = orig.deviceProtectedDataDir;

        credentialProtectedDataDir = orig.credentialProtectedDataDir;

        nativeLibraryDir = orig.nativeLibraryDir;

        secondaryNativeLibraryDir = orig.secondaryNativeLibraryDir;

        handleProfiling = orig.handleProfiling;

        functionalTest = orig.functionalTest;

    }
@@ -120,6 +120,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeString(deviceProtectedDataDir);

        dest.writeString(credentialProtectedDataDir);

        dest.writeString(nativeLibraryDir);

        dest.writeString(secondaryNativeLibraryDir);

        dest.writeInt((handleProfiling == false) ? 0 : 1);

        dest.writeInt((functionalTest == false) ? 0 : 1);

    }
@@ -145,6 +146,7 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
        deviceProtectedDataDir = source.readString();

        credentialProtectedDataDir = source.readString();

        nativeLibraryDir = source.readString();

        secondaryNativeLibraryDir = source.readString();

        handleProfiling = source.readInt() != 0;

        functionalTest = source.readInt() != 0;

    }
@@ -160,5 +162,6 @@ public class InstrumentationInfo extends PackageItemInfo implements Parcelable { 
        ai.deviceProtectedDataDir = deviceProtectedDataDir;

        ai.credentialProtectedDataDir = credentialProtectedDataDir;

        ai.nativeLibraryDir = nativeLibraryDir;

        ai.secondaryNativeLibraryDir = secondaryNativeLibraryDir;

    }

}

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -8720,9 +8720,8 @@ public class PackageManagerService extends IPackageManager.Stub { 
                a.info.deviceProtectedDataDir = pkg.applicationInfo.deviceProtectedDataDir;

                a.info.credentialProtectedDataDir = pkg.applicationInfo.credentialProtectedDataDir;













                // TODO: Update instrumentation.nativeLibraryDir as well ? Does it













                // need other information about the application, like the ABI and what not ?















                a.info.nativeLibraryDir = pkg.applicationInfo.nativeLibraryDir;













                a.info.secondaryNativeLibraryDir = pkg.applicationInfo.secondaryNativeLibraryDir;















                mInstrumentation.put(a.getComponentName(), a);















                if ((policyFlags&PackageParser.PARSE_CHATTY) != 0) {















                    if (r == null) {