diff options
| author | Martijn Coenen <maco@google.com> | 2017-04-30 14:01:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-30 14:01:00 +0000 |
| commit | 37a08d4bf46d26203f8e27f1d83bb317ef3b1dcd (patch) | |
| tree | e1c65de88fa4aae06e4403e86dd0a9d3e416dc15 /core/java | |
| parent | 9c4f9988d5fa19432a23abde4b0cb6f58c2418fa (diff) | |
| parent | 23a0f58eea05b5c16bf29fd7a916e7591d8a083d (diff) | |
Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev am: 35312fd4c6
am: 23a0f58eea
Change-Id: I2b7aada5d0ec51c2a5513b15f6f855fd7cf5166c
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; } |