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

Commit e4960cf4 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Add persistentFeature application attribute." into oc-dev

parents 498a44f3 441d61bf

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ package android { 
    field public static final int persistableMode = 16843821; // 0x101042d

    field public static final int persistent = 16842765; // 0x101000d

    field public static final int persistentDrawingCache = 16842990; // 0x10100ee

    field public static final int persistentFeature = 16844134; // 0x1010566

    field public static final deprecated int phoneNumber = 16843111; // 0x1010167

    field public static final int pivotX = 16843189; // 0x10101b5

    field public static final int pivotY = 16843190; // 0x10101b6

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,7 @@ package android { 
    field public static final int persistableMode = 16843821; // 0x101042d

    field public static final int persistent = 16842765; // 0x101000d

    field public static final int persistentDrawingCache = 16842990; // 0x10100ee

    field public static final int persistentFeature = 16844134; // 0x1010566

    field public static final deprecated int phoneNumber = 16843111; // 0x1010167

    field public static final int pivotX = 16843189; // 0x10101b5

    field public static final int pivotY = 16843190; // 0x10101b6

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ package android { 
    field public static final int persistableMode = 16843821; // 0x101042d

    field public static final int persistent = 16842765; // 0x101000d

    field public static final int persistentDrawingCache = 16842990; // 0x10100ee

    field public static final int persistentFeature = 16844134; // 0x1010566

    field public static final deprecated int phoneNumber = 16843111; // 0x1010167

    field public static final int pivotX = 16843189; // 0x10101b5

    field public static final int pivotY = 16843190; // 0x10101b6

core/java/android/content/pm/PackageManager.java

+11 −0
Original line number Diff line number Diff line
@@ -1761,6 +1761,17 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports any

     * one of the {@link #FEATURE_NFC}, {@link #FEATURE_NFC_HOST_CARD_EMULATION},

     * or {@link #FEATURE_NFC_HOST_CARD_EMULATION_NFCF} features.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_NFC_ANY = "android.hardware.nfc.any";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports the OpenGL ES

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

+6 −1
Original line number Diff line number Diff line
@@ -3363,9 +3363,14 @@ public class PackageParser { 
            if (sa.getBoolean(

                    com.android.internal.R.styleable.AndroidManifestApplication_persistent,

                    false)) {

                // Check if persistence is based on a feature being present

                final String requiredFeature = sa.getNonResourceString(

                    com.android.internal.R.styleable.AndroidManifestApplication_persistentFeature);

                if (requiredFeature == null || mCallback.hasFeature(requiredFeature)) {

                    ai.flags |= ApplicationInfo.FLAG_PERSISTENT;

                }

            }

        }



        if (sa.getBoolean(

                com.android.internal.R.styleable.AndroidManifestApplication_requiredForAllUsers,