diff options
| author | Kenny Root <kroot@google.com> | 2012-05-30 15:50:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-30 15:50:45 -0700 |
| commit | 327bc6bb5037dbd0eb05bdb4b0897196bd154366 (patch) | |
| tree | 5e73a674dc639fab8028ce746b2ec774aa1071b1 /core/java/android/content | |
| parent | 2f3c472b69cabfb051bbcb0b8fa1dee73346de84 (diff) | |
| parent | 65519b8bb94321889eb3e34c76428f6dd9e0bd84 (diff) | |
| download | frameworks_base-327bc6bb5037dbd0eb05bdb4b0897196bd154366.zip frameworks_base-327bc6bb5037dbd0eb05bdb4b0897196bd154366.tar.gz frameworks_base-327bc6bb5037dbd0eb05bdb4b0897196bd154366.tar.bz2 | |
am 65519b8b: am 03e93e51: Merge "Move package-wide flags out of parseApplication" into jb-dev
* commit '65519b8bb94321889eb3e34c76428f6dd9e0bd84':
Move package-wide flags out of parseApplication
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index ad52e13..e180df4 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -935,7 +935,17 @@ public class PackageParser { com.android.internal.R.styleable.AndroidManifest_installLocation, PARSE_DEFAULT_INSTALL_LOCATION); pkg.applicationInfo.installLocation = pkg.installLocation; - + + /* Set the global "forward lock" flag */ + if ((flags & PARSE_FORWARD_LOCK) != 0) { + pkg.applicationInfo.flags |= ApplicationInfo.FLAG_FORWARD_LOCK; + } + + /* Set the global "on SD card" flag */ + if ((flags & PARSE_ON_SDCARD) != 0) { + pkg.applicationInfo.flags |= ApplicationInfo.FLAG_EXTERNAL_STORAGE; + } + // Resource boolean are -1, so 1 means we don't know the value. int supportsSmallScreens = 1; int supportsNormalScreens = 1; @@ -1726,14 +1736,6 @@ public class PackageParser { } } - if ((flags & PARSE_FORWARD_LOCK) != 0) { - ai.flags |= ApplicationInfo.FLAG_FORWARD_LOCK; - } - - if ((flags & PARSE_ON_SDCARD) != 0) { - ai.flags |= ApplicationInfo.FLAG_EXTERNAL_STORAGE; - } - if (sa.getBoolean( com.android.internal.R.styleable.AndroidManifestApplication_debuggable, false)) { |