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

Commit 589a1bc0 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Add manifest attribute for multiArch apps.

bug: 16013931
Change-Id: Ie8b01d364eed0846deeddf11e0d6e4cc1fba3e61
parent 4143bc5f
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ package android {
    field public static final int mirrorForRtl = 16843726; // 0x10103ce
    field public static final int mode = 16843134; // 0x101017e
    field public static final int moreIcon = 16843061; // 0x1010135
    field public static final int multiArch = 16843918; // 0x101048e
    field public static final int multiprocess = 16842771; // 0x1010013
    field public static final int name = 16842755; // 0x1010003
    field public static final int navigationBarColor = 16843860; // 0x1010454
@@ -8194,6 +8195,7 @@ package android.content.pm {
    field public static final int FLAG_IS_GAME = 33554432; // 0x2000000
    field public static final int FLAG_KILL_AFTER_RESTORE = 65536; // 0x10000
    field public static final int FLAG_LARGE_HEAP = 1048576; // 0x100000
    field public static final int FLAG_MULTIARCH = -2147483648; // 0x80000000
    field public static final int FLAG_PERSISTENT = 8; // 0x8
    field public static final int FLAG_RESIZEABLE_FOR_SCREENS = 4096; // 0x1000
    field public static final int FLAG_RESTORE_ANY_VERSION = 131072; // 0x20000
+28 −15
Original line number Diff line number Diff line
@@ -334,12 +334,24 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
    public static final int FLAG_FULL_BACKUP_ONLY = 1<<26;

    /**
     * Value for {@link #flags}: set to {@code true} if the application
     * is permitted to hold privileged permissions.
     * Value for {@link #flags}: true if the application is blocked via restrictions and for
     * most purposes is considered as not installed.
     * {@hide}
     */
    public static final int FLAG_BLOCKED = 1<<27;

    /**
     * Value for {@link #flags}: set to <code>true</code> if the application
     * has reported that it is heavy-weight, and thus can not participate in
     * the normal application lifecycle.
     *
     * <p>Comes from the
     * android.R.styleable#AndroidManifestApplication_cantSaveState
     * attribute of the &lt;application&gt; tag.
     *
     * {@hide}
     */
    public static final int FLAG_PRIVILEGED = 1<<30;
    public static final int FLAG_CANT_SAVE_STATE = 1<<28;

    /**
     * Value for {@link #flags}: Set to true if the application has been
@@ -352,24 +364,25 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
    public static final int FLAG_FORWARD_LOCK = 1<<29;

    /**
     * Value for {@link #flags}: set to <code>true</code> if the application
     * has reported that it is heavy-weight, and thus can not participate in
     * the normal application lifecycle.
     *
     * <p>Comes from the
     * android.R.styleable#AndroidManifestApplication_cantSaveState
     * attribute of the &lt;application&gt; tag.
     * Value for {@link #flags}: set to {@code true} if the application
     * is permitted to hold privileged permissions.
     *
     * {@hide}
     */
    public static final int FLAG_CANT_SAVE_STATE = 1<<28;
    public static final int FLAG_PRIVILEGED = 1<<30;

    /**
     * Value for {@link #flags}: true if the application is blocked via restrictions and for
     * most purposes is considered as not installed.
     * {@hide}
     * Value for {@link #flags}: true if code from this application will need to be
     * loaded into other applications' processes. On devices that support multiple
     * instruction sets, this implies the code might be loaded into a process that's
     * using any of the devices supported instruction sets.
     *
     * <p> The system might treat such applications specially, for eg., by
     * extracting the application's native libraries for all supported instruction
     * sets or by compiling the application's dex code for all supported instruction
     * sets.
     */
    public static final int FLAG_BLOCKED = 1<<27;
    public static final int FLAG_MULTIARCH  = 1 << 31;

    /**
     * Flags associated with the application.  Any combination of
+6 −0
Original line number Diff line number Diff line
@@ -2305,6 +2305,12 @@ public class PackageParser {
            ai.flags |= ApplicationInfo.FLAG_SUPPORTS_RTL;
        }

        if (sa.getBoolean(
                com.android.internal.R.styleable.AndroidManifestApplication_multiArch,
                false)) {
            ai.flags |= ApplicationInfo.FLAG_MULTIARCH;
        }

        String str;
        str = sa.getNonConfigurationString(
                com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);
+12 −0
Original line number Diff line number Diff line
@@ -388,6 +388,17 @@
         with the same {@link android.R.attr#taskAffinity} as it has. -->
    <attr name="allowTaskReparenting" format="boolean" />

    <!-- Declare that code from this application will need to be loaded into other
         applications' processes. On devices that support multiple instruction sets,
         this implies the code might be loaded into a process that's using any of the devices
         supported instruction sets.
         
         <p> The system might treat such applications specially, for eg., by
         extracting the application's native libraries for all supported instruction
         sets or by compiling the application's dex code for all supported instruction
         sets. -->
    <attr name="multiArch" format ="boolean" />
    
    <!-- Specify whether a component is allowed to have multiple instances
         of itself running in different processes.  Use with the activity
         and provider tags.
@@ -1114,6 +1125,7 @@
             "com.google". -->
        <attr name="requiredAccountType" format="string"/>
        <attr name="isGame" />
        <attr name="multiArch" />
    </declare-styleable>
    
    <!-- The <code>permission</code> tag declares a security permission that can be
+1 −0
Original line number Diff line number Diff line
@@ -2507,4 +2507,5 @@
  <!-- A transition that moves views in or out of the scene to or from the left edge when
       a view visibility changes. -->
  <public type="transition" name="slide_left"/>
  <public type="attr" name="multiArch" />
</resources>