Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martijn Coenen
2017-04-30 13:47:06 +00:00
committed by Android (Google) Code Review
parent 4bac2d2fd7 8d74ca4ee4
commit 35312fd4c6
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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

2
api/system-current.txt
View File

@@ -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

2
api/test-current.txt
View File

@@ -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

3
core/java/android/content/pm/PackageParser.java
View File

@@ -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;
}

4
core/res/res/values/attrs_manifest.xml
View File

@@ -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).

2
core/res/res/values/public.xml
View File

@@ -2815,7 +2815,7 @@
<public name="maxAspectRatio"/>
<public name="iconSpaceReserved"/>
<public name="defaultFocusHighlightEnabled" />
<public name="persistentFeature"/>
<public name="persistentWhenFeatureAvailable"/>
<public name="windowSplashscreenContent" />
<!-- @hide @SystemApi -->
<public name="requiredSystemPropertyName" />