diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-01-28 12:32:10 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2016-01-28 13:30:07 -0700 |
| commit | c26d59f6abc875ff3a1bba1b5cc3fd9f73dd3dfd (patch) | |
| tree | b91d2f1f173f5e8d00373dd888bb43d20b73181f /core/java | |
| parent | f202143597b384686cd8ad8b6258541f96dfec96 (diff) | |
Fix activity-alias encryption awareness bug.
Since the activity-alias is backed by the same code as the original
activity definition, they should both have an identical encryption
awareness. This fixes a bug where we accidentally dropped that value.
Bug: 26731340
Change-Id: I6ad615332df7d16542893a49e6997c88fc24334b
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 9319c2ec99d1..44cd0039dc09 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3491,6 +3491,7 @@ public class PackageParser { info.maxRecents = target.info.maxRecents; info.layout = target.info.layout; info.resizeMode = target.info.resizeMode; + info.encryptionAware = target.info.encryptionAware; Activity a = new Activity(mParseActivityAliasArgs, info); if (outError[0] != null) { |