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

am 03e93e51: Merge "Move package-wide flags out of parseApplication" into jb-dev

Browse Source 
* commit '03e93e51c8cf936dc68bb807d28308628e3981cc':
  Move package-wide flags out of parseApplication
This commit is contained in:
Kenny Root
2012-05-30 15:46:49 -07:00
committed by Android Git Automerger
parent 2eb203aa92 03e93e51c8
commit 65519b8bb9
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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