diff options
| author | Martijn Coenen <maco@google.com> | 2017-04-30 13:53:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-30 13:53:54 +0000 |
| commit | 23a0f58eea05b5c16bf29fd7a916e7591d8a083d (patch) | |
| tree | 64f471066b05419b14e6ca5330daf078b33cf40f /core/java | |
| parent | e865c5e5e4f2c235ffe4fba5524dba5e5897994c (diff) | |
| parent | 35312fd4c6fccaf5869b8fbf7bef9b1a6def75ba (diff) | |
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev
am: 35312fd4c6
Change-Id: Ibab6c7a25fe9534bd1a274065b36dc7813f745e0
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index fc26d0e792de..101317784c17 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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; } |