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

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

Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev

parents 4bac2d2f 8d74ca4e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +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 int persistentWhenFeatureAvailable = 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 −1
Original line number Diff line number Diff line
@@ -1113,7 +1113,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 int persistentWhenFeatureAvailable = 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 −1
Original line number Diff line number Diff line
@@ -993,7 +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 int persistentWhenFeatureAvailable = 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/PackageParser.java

+2 −1
Original line number Diff line number Diff line
@@ -3437,7 +3437,8 @@ public class PackageParser { 
                    false)) {

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

                final String requiredFeature = sa.getNonResourceString(

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

                    com.android.internal.R.styleable.

                    AndroidManifestApplication_persistentWhenFeatureAvailable);

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

                    ai.flags |= ApplicationInfo.FLAG_PERSISTENT;

                }

core/res/res/values/attrs_manifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ 


    <!-- If set, the "persistent" attribute will only be honored if the feature

         specified here is present on the device. -->

    <attr name="persistentFeature" format="string" />

    <attr name="persistentWhenFeatureAvailable" format="string" />



    <!-- Flag to specify if this application needs to be present for all users. Only pre-installed

         applications can request this feature. Default value is false. -->
@@ -1362,7 +1362,7 @@ 
             for normal behavior. -->

        <attr name="hasCode" format="boolean" />

        <attr name="persistent" />

        <attr name="persistentFeature" />

        <attr name="persistentWhenFeatureAvailable" />

        <attr name="requiredForAllUsers" />

        <!-- Specify whether the components in this application are enabled or not (that is, can be

             instantiated by the system).