Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo (01f6b75b) · Commits · e / os / android_frameworks_base

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

+33 −7

Original line number	Diff line number	Diff line
		@@ -1212,7 +1212,7 @@ public class PackageParser {
		if (procSeq == null \|\| procSeq.length() <= 0) {
		return defProc;
		}
		return buildCompoundName(pkg, procSeq, "package", outError);
		return buildCompoundName(pkg, procSeq, "process", outError);
		}

		private static String buildTaskAffinityName(String pkg, String defProc,
		@@ -1544,14 +1544,32 @@ public class PackageParser {
		com.android.internal.R.styleable.AndroidManifestApplication_permission, 0);
		ai.permission = (str != null && str.length() > 0) ? str.intern() : null;

		if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
		str = sa.getNonConfigurationString(
		com.android.internal.R.styleable.AndroidManifestApplication_taskAffinity, 0);
		} else {
		// Some older apps have been seen to use a resource reference
		// here that on older builds was ignored (with a warning). We
		// need to continue to do this for them so they don't break.
		str = sa.getNonResourceString(
		com.android.internal.R.styleable.AndroidManifestApplication_taskAffinity);
		}
		ai.taskAffinity = buildTaskAffinityName(ai.packageName, ai.packageName,
		str, outError);

		if (outError[0] == null) {
		ai.processName = buildProcessName(ai.packageName, null, sa.getNonConfigurationString(
		com.android.internal.R.styleable.AndroidManifestApplication_process, 0),
		CharSequence pname;
		if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
		pname = sa.getNonConfigurationString(
		com.android.internal.R.styleable.AndroidManifestApplication_process, 0);
		} else {
		// Some older apps have been seen to use a resource reference
		// here that on older builds was ignored (with a warning). We
		// need to continue to do this for them so they don't break.
		pname = sa.getNonResourceString(
		com.android.internal.R.styleable.AndroidManifestApplication_process);
		}
		ai.processName = buildProcessName(ai.packageName, null, pname,
		flags, mSeparateProcesses, outError);

		ai.enabled = sa.getBoolean(
		@@ -2796,9 +2814,17 @@ public class PackageParser {
		}

		if (args.processRes != 0) {
		CharSequence pname;
		if (owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.FROYO) {
		pname = args.sa.getNonConfigurationString(args.processRes, 0);
		} else {
		// Some older apps have been seen to use a resource reference
		// here that on older builds was ignored (with a warning). We
		// need to continue to do this for them so they don't break.
		pname = args.sa.getNonResourceString(args.processRes);
		}
		outInfo.processName = buildProcessName(owner.applicationInfo.packageName,
		owner.applicationInfo.processName,
		args.sa.getNonConfigurationString(args.processRes, 0),
		owner.applicationInfo.processName, pname,
		args.flags, args.sepProcesses, args.outError);
		}