am 03e93e51: Merge "Move package-wide flags out of parseApplication" into jb-dev (65519b8b) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageParser.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -936,6 +936,16 @@ public class PackageParser {
		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)) {