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

Commit 90214cd7 authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android Git Automerger
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
parents d99c5f6f 6a225edc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ package android { 
    field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6

    field public static final int exported = 16842768; // 0x1010010

    field public static final int extraTension = 16843371; // 0x101026b

    field public static final int extractNativeLibs = 16844008; // 0x10104e8

    field public static final int factor = 16843219; // 0x10101d3

    field public static final int fadeDuration = 16843384; // 0x1010278

    field public static final int fadeEnabled = 16843390; // 0x101027e
@@ -8665,6 +8666,7 @@ package android.content.pm { 
    field public static final int FLAG_ALLOW_TASK_REPARENTING = 32; // 0x20

    field public static final int FLAG_DEBUGGABLE = 2; // 0x2

    field public static final int FLAG_EXTERNAL_STORAGE = 262144; // 0x40000

    field public static final int FLAG_EXTRACT_NATIVE_LIBS = 268435456; // 0x10000000

    field public static final int FLAG_FACTORY_TEST = 16; // 0x10

    field public static final int FLAG_FULL_BACKUP_ONLY = 67108864; // 0x4000000

    field public static final int FLAG_HAS_CODE = 4; // 0x4

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ package android { 
    field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6

    field public static final int exported = 16842768; // 0x1010010

    field public static final int extraTension = 16843371; // 0x101026b

    field public static final int extractNativeLibs = 16844008; // 0x10104e8

    field public static final int factor = 16843219; // 0x10101d3

    field public static final int fadeDuration = 16843384; // 0x1010278

    field public static final int fadeEnabled = 16843390; // 0x101027e
@@ -8880,6 +8881,7 @@ package android.content.pm { 
    field public static final int FLAG_ALLOW_TASK_REPARENTING = 32; // 0x20

    field public static final int FLAG_DEBUGGABLE = 2; // 0x2

    field public static final int FLAG_EXTERNAL_STORAGE = 262144; // 0x40000

    field public static final int FLAG_EXTRACT_NATIVE_LIBS = 268435456; // 0x10000000

    field public static final int FLAG_FACTORY_TEST = 16; // 0x10

    field public static final int FLAG_FULL_BACKUP_ONLY = 67108864; // 0x4000000

    field public static final int FLAG_HAS_CODE = 4; // 0x4

core/java/android/content/pm/ApplicationInfo.java

+5 −0
Original line number Diff line number Diff line
@@ -345,6 +345,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

    public static final int FLAG_USES_CLEARTEXT_TRAFFIC = 1<<27;



    /**

     * When set installer extracts native libs from .apk files.

     */

    public static final int FLAG_EXTRACT_NATIVE_LIBS = 1<<28;



    /**

     * Value for {@link #flags}: true if code from this application will need to be

     * loaded into other applications' processes. On devices that support multiple

core/java/android/content/pm/PackageParser.java

+18 −3
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ public class PackageParser { 


        public final boolean coreApp;

        public final boolean multiArch;

        public final boolean extractNativeLibs;



        public PackageLite(String codePath, ApkLite baseApk, String[] splitNames,

                String[] splitCodePaths, int[] splitRevisionCodes) {
@@ -284,6 +285,7 @@ public class PackageParser { 
            this.splitRevisionCodes = splitRevisionCodes;

            this.coreApp = baseApk.coreApp;

            this.multiArch = baseApk.multiArch;

            this.extractNativeLibs = baseApk.extractNativeLibs;

        }



        public List<String> getAllCodePaths() {
@@ -310,10 +312,12 @@ public class PackageParser { 
        public final Signature[] signatures;

        public final boolean coreApp;

        public final boolean multiArch;

        public final boolean extractNativeLibs;



        public ApkLite(String codePath, String packageName, String splitName, int versionCode,

                int revisionCode, int installLocation, List<VerifierInfo> verifiers,

                Signature[] signatures, boolean coreApp, boolean multiArch) {

                Signature[] signatures, boolean coreApp, boolean multiArch,

                boolean extractNativeLibs) {

            this.codePath = codePath;

            this.packageName = packageName;

            this.splitName = splitName;
@@ -324,6 +328,7 @@ public class PackageParser { 
            this.signatures = signatures;

            this.coreApp = coreApp;

            this.multiArch = multiArch;

            this.extractNativeLibs = extractNativeLibs;

        }

    }
@@ -1269,6 +1274,7 @@ public class PackageParser { 
        int revisionCode = 0;

        boolean coreApp = false;

        boolean multiArch = false;

        boolean extractNativeLibs = true;



        for (int i = 0; i < attrs.getAttributeCount(); i++) {

            final String attr = attrs.getAttributeName(i);
@@ -1307,14 +1313,17 @@ public class PackageParser { 
                    final String attr = attrs.getAttributeName(i);

                    if ("multiArch".equals(attr)) {

                        multiArch = attrs.getAttributeBooleanValue(i, false);

                        break;

                    }

                    if ("extractNativeLibs".equals(attr)) {

                        extractNativeLibs = attrs.getAttributeBooleanValue(i, true);

                    }

                }

            }

        }



        return new ApkLite(codePath, packageSplit.first, packageSplit.second, versionCode,

                revisionCode, installLocation, verifiers, signatures, coreApp, multiArch);

                revisionCode, installLocation, verifiers, signatures, coreApp, multiArch,

                extractNativeLibs);

    }



    /**
@@ -2546,6 +2555,12 @@ public class PackageParser { 
            ai.flags |= ApplicationInfo.FLAG_MULTIARCH;

        }



        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestApplication_extractNativeLibs,

                true)) {

            ai.flags |= ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS;

        }



        String str;

        str = sa.getNonConfigurationString(

                com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);

core/java/com/android/internal/content/NativeLibraryHelper.java

+21 −10
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.pm.PackageParser.PackageLite; 
import android.content.pm.PackageParser.PackageParserException;

import android.os.Build;

import android.os.SELinux;

import android.os.SystemProperties;

import android.system.ErrnoException;

import android.system.Os;

import android.util.Slog;
@@ -74,6 +75,7 @@ public class NativeLibraryHelper { 


        final long[] apkHandles;

        final boolean multiArch;

        final boolean extractNativeLibs;



        public static Handle create(File packageFile) throws IOException {

            try {
@@ -86,14 +88,16 @@ public class NativeLibraryHelper { 


        public static Handle create(Package pkg) throws IOException {

            return create(pkg.getAllCodePaths(),

                    (pkg.applicationInfo.flags & ApplicationInfo.FLAG_MULTIARCH) != 0);

                    (pkg.applicationInfo.flags & ApplicationInfo.FLAG_MULTIARCH) != 0,

                    (pkg.applicationInfo.flags & ApplicationInfo.FLAG_EXTRACT_NATIVE_LIBS) != 0);

        }



        public static Handle create(PackageLite lite) throws IOException {

            return create(lite.getAllCodePaths(), lite.multiArch);

            return create(lite.getAllCodePaths(), lite.multiArch, lite.extractNativeLibs);

        }



        private static Handle create(List<String> codePaths, boolean multiArch) throws IOException {

        private static Handle create(List<String> codePaths, boolean multiArch,

                boolean extractNativeLibs) throws IOException {

            final int size = codePaths.size();

            final long[] apkHandles = new long[size];

            for (int i = 0; i < size; i++) {
@@ -108,12 +112,13 @@ public class NativeLibraryHelper { 
                }

            }



            return new Handle(apkHandles, multiArch);

            return new Handle(apkHandles, multiArch, extractNativeLibs);

        }



        Handle(long[] apkHandles, boolean multiArch) {

        Handle(long[] apkHandles, boolean multiArch, boolean extractNativeLibs) {

            this.apkHandles = apkHandles;

            this.multiArch = multiArch;

            this.extractNativeLibs = extractNativeLibs;

            mGuard.open("close");

        }
@@ -146,8 +151,8 @@ public class NativeLibraryHelper { 


    private static native long nativeSumNativeBinaries(long handle, String cpuAbi);



    private native static int nativeCopyNativeBinaries(long handle,

            String sharedLibraryPath, String abiToCopy);

    private native static int nativeCopyNativeBinaries(long handle, String sharedLibraryPath,

            String abiToCopy, boolean extractNativeLibs, boolean hasNativeBridge);



    private static long sumNativeBinaries(Handle handle, String abi) {

        long sum = 0;
@@ -167,7 +172,8 @@ public class NativeLibraryHelper { 
     */

    public static int copyNativeBinaries(Handle handle, File sharedLibraryDir, String abi) {

        for (long apkHandle : handle.apkHandles) {

            int res = nativeCopyNativeBinaries(apkHandle, sharedLibraryDir.getPath(), abi);

            int res = nativeCopyNativeBinaries(apkHandle, sharedLibraryDir.getPath(), abi,

                    handle.extractNativeLibs, HAS_NATIVE_BRIDGE);

            if (res != INSTALL_SUCCEEDED) {

                return res;

            }
@@ -218,7 +224,8 @@ public class NativeLibraryHelper { 
    /**

     * Remove the native binaries of a given package. This deletes the files

     */

    public static void removeNativeBinariesFromDirLI(File nativeLibraryRoot, boolean deleteRootDir) {

    public static void removeNativeBinariesFromDirLI(File nativeLibraryRoot,

            boolean deleteRootDir) {

        if (DEBUG_NATIVE) {

            Slog.w(TAG, "Deleting native binaries from: " + nativeLibraryRoot.getPath());

        }
@@ -247,7 +254,8 @@ public class NativeLibraryHelper { 
            // asked to or this will prevent installation of future updates.

            if (deleteRootDir) {

                if (!nativeLibraryRoot.delete()) {

                    Slog.w(TAG, "Could not delete native binary directory: " + nativeLibraryRoot.getPath());

                    Slog.w(TAG, "Could not delete native binary directory: " +

                            nativeLibraryRoot.getPath());

                }

            }

        }
@@ -416,6 +424,9 @@ public class NativeLibraryHelper { 
    // We don't care about the other return values for now.

    private static final int BITCODE_PRESENT = 1;



    private static final boolean HAS_NATIVE_BRIDGE =

            !"0".equals(SystemProperties.get("ro.dalvik.vm.native.bridge", "0"));



    private static native int hasRenderscriptBitcode(long apkHandle);



    public static boolean hasRenderscriptBitcode(Handle handle) throws IOException {