Merge "Don't override targetVers with minCode" am: 3b0eba4499 am: 234a906ee1 (a844fff7) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2206,10 +2206,10 @@ public class PackageParser {
	com.android.internal.R.styleable.AndroidManifestUsesSdk_minSdkVersion);		com.android.internal.R.styleable.AndroidManifestUsesSdk_minSdkVersion);
	if (val != null) {		if (val != null) {
	if (val.type == TypedValue.TYPE_STRING && val.string != null) {		if (val.type == TypedValue.TYPE_STRING && val.string != null) {
	targetCode = minCode = val.string.toString();		minCode = val.string.toString();
	} else {		} else {
	// If it's not a string, it's an integer.		// If it's not a string, it's an integer.
	targetVers = minVers = val.data;		minVers = val.data;
	}		}
	}		}

	@@ -2225,6 +2225,9 @@ public class PackageParser {
	// If it's not a string, it's an integer.		// If it's not a string, it's an integer.
	targetVers = val.data;		targetVers = val.data;
	}		}
			} else {
			targetVers = minVers;
			targetCode = minCode;
	}		}

	sa.recycle();		sa.recycle();