Merge "Show warning when app was compiled against incompatible preview SDK" (83770069) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ApplicationInfo.java

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package android.content.pm;
	import static android.os.Build.VERSION_CODES.DONUT;		import static android.os.Build.VERSION_CODES.DONUT;

	import android.annotation.IntDef;		import android.annotation.IntDef;
			import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.annotation.TestApi;		import android.annotation.TestApi;
	import android.content.Context;		import android.content.Context;
	@@ -889,6 +890,29 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
	*/		*/
	public int versionCode;		public int versionCode;

			/**
			* The user-visible SDK version (ex. 26) of the framework against which the application claims
			* to have been compiled, or {@code 0} if not specified.
			* <p>
			* This property is the compile-time equivalent of
			* {@link android.os.Build.VERSION#CODENAME Build.VERSION.SDK_INT}.
			*
			* @hide For platform use only; we don't expect developers to need to read this value.
			*/
			public int compileSdkVersion;

			/**
			* The development codename (ex. "O", "REL") of the framework against which the application
			* claims to have been compiled, or {@code null} if not specified.
			* <p>
			* This property is the compile-time equivalent of
			* {@link android.os.Build.VERSION#CODENAME Build.VERSION.CODENAME}.
			*
			* @hide For platform use only; we don't expect developers to need to read this value.
			*/
			@Nullable
			public String compileSdkVersionCodename;

	/**		/**
	* When false, indicates that all components within this application are		* When false, indicates that all components within this application are
	* considered disabled, regardless of their individually set enabled status.		* considered disabled, regardless of their individually set enabled status.
	@@ -1305,6 +1329,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
	dest.writeInt(targetSandboxVersion);		dest.writeInt(targetSandboxVersion);
	dest.writeString(classLoaderName);		dest.writeString(classLoaderName);
	dest.writeStringArray(splitClassLoaderNames);		dest.writeStringArray(splitClassLoaderNames);
			dest.writeInt(compileSdkVersion);
			dest.writeString(compileSdkVersionCodename);
	}		}

	public static final Parcelable.Creator<ApplicationInfo> CREATOR		public static final Parcelable.Creator<ApplicationInfo> CREATOR
	@@ -1372,6 +1398,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
	targetSandboxVersion = source.readInt();		targetSandboxVersion = source.readInt();
	classLoaderName = source.readString();		classLoaderName = source.readString();
	splitClassLoaderNames = source.readStringArray();		splitClassLoaderNames = source.readStringArray();
			compileSdkVersion = source.readInt();
			compileSdkVersionCodename = source.readString();
	}		}

	/**		/**

core/java/android/content/pm/PackageInfo.java

+28 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.content.pm;		package android.content.pm;

			import android.annotation.Nullable;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;

	@@ -289,6 +290,29 @@ public class PackageInfo implements Parcelable {
	/** @hide */		/** @hide */
	public boolean isStaticOverlay;		public boolean isStaticOverlay;

			/**
			* The user-visible SDK version (ex. 26) of the framework against which the application claims
			* to have been compiled, or {@code 0} if not specified.
			* <p>
			* This property is the compile-time equivalent of
			* {@link android.os.Build.VERSION#SDK_INT Build.VERSION.SDK_INT}.
			*
			* @hide For platform use only; we don't expect developers to need to read this value.
			*/
			public int compileSdkVersion;

			/**
			* The development codename (ex. "O", "REL") of the framework against which the application
			* claims to have been compiled, or {@code null} if not specified.
			* <p>
			* This property is the compile-time equivalent of
			* {@link android.os.Build.VERSION#CODENAME Build.VERSION.CODENAME}.
			*
			* @hide For platform use only; we don't expect developers to need to read this value.
			*/
			@Nullable
			public String compileSdkVersionCodename;

	public PackageInfo() {		public PackageInfo() {
	}		}

	@@ -344,6 +368,8 @@ public class PackageInfo implements Parcelable {
	dest.writeString(overlayTarget);		dest.writeString(overlayTarget);
	dest.writeInt(isStaticOverlay ? 1 : 0);		dest.writeInt(isStaticOverlay ? 1 : 0);
	dest.writeInt(overlayPriority);		dest.writeInt(overlayPriority);
			dest.writeInt(compileSdkVersion);
			dest.writeString(compileSdkVersionCodename);
	}		}

	public static final Parcelable.Creator<PackageInfo> CREATOR		public static final Parcelable.Creator<PackageInfo> CREATOR
	@@ -396,6 +422,8 @@ public class PackageInfo implements Parcelable {
	overlayTarget = source.readString();		overlayTarget = source.readString();
	isStaticOverlay = source.readInt() != 0;		isStaticOverlay = source.readInt() != 0;
	overlayPriority = source.readInt();		overlayPriority = source.readInt();
			compileSdkVersion = source.readInt();
			compileSdkVersionCodename = source.readString();

	// The component lists were flattened with the redundant ApplicationInfo		// The component lists were flattened with the redundant ApplicationInfo
	// instances omitted. Distribute the canonical one here as appropriate.		// instances omitted. Distribute the canonical one here as appropriate.

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

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -678,6 +678,8 @@ public class PackageParser {
	pi.overlayTarget = p.mOverlayTarget;		pi.overlayTarget = p.mOverlayTarget;
	pi.overlayPriority = p.mOverlayPriority;		pi.overlayPriority = p.mOverlayPriority;
	pi.isStaticOverlay = p.mIsStaticOverlay;		pi.isStaticOverlay = p.mIsStaticOverlay;
			pi.compileSdkVersion = p.mCompileSdkVersion;
			pi.compileSdkVersionCodename = p.mCompileSdkVersionCodename;
	pi.firstInstallTime = firstInstallTime;		pi.firstInstallTime = firstInstallTime;
	pi.lastUpdateTime = lastUpdateTime;		pi.lastUpdateTime = lastUpdateTime;
	if ((flags&PackageManager.GET_GIDS) != 0) {		if ((flags&PackageManager.GET_GIDS) != 0) {
	@@ -2076,6 +2078,16 @@ public class PackageParser {

	pkg.coreApp = parser.getAttributeBooleanValue(null, "coreApp", false);		pkg.coreApp = parser.getAttributeBooleanValue(null, "coreApp", false);

			pkg.mCompileSdkVersion = sa.getInteger(
			com.android.internal.R.styleable.AndroidManifest_compileSdkVersion, 0);
			pkg.applicationInfo.compileSdkVersion = pkg.mCompileSdkVersion;
			pkg.mCompileSdkVersionCodename = sa.getNonConfigurationString(
			com.android.internal.R.styleable.AndroidManifest_compileSdkVersionCodename, 0);
			if (pkg.mCompileSdkVersionCodename != null) {
			pkg.mCompileSdkVersionCodename = pkg.mCompileSdkVersionCodename.intern();
			}
			pkg.applicationInfo.compileSdkVersionCodename = pkg.mCompileSdkVersionCodename;

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

	return parseBaseApkCommon(pkg, null, res, parser, flags, outError);		return parseBaseApkCommon(pkg, null, res, parser, flags, outError);
	@@ -5967,6 +5979,9 @@ public class PackageParser {
	public boolean mIsStaticOverlay;		public boolean mIsStaticOverlay;
	public boolean mTrustedOverlay;		public boolean mTrustedOverlay;

			public int mCompileSdkVersion;
			public String mCompileSdkVersionCodename;

	/**		/**
	* Data used to feed the KeySetManagerService		* Data used to feed the KeySetManagerService
	*/		*/
	@@ -6458,6 +6473,8 @@ public class PackageParser {
	mOverlayPriority = dest.readInt();		mOverlayPriority = dest.readInt();
	mIsStaticOverlay = (dest.readInt() == 1);		mIsStaticOverlay = (dest.readInt() == 1);
	mTrustedOverlay = (dest.readInt() == 1);		mTrustedOverlay = (dest.readInt() == 1);
			mCompileSdkVersion = dest.readInt();
			mCompileSdkVersionCodename = dest.readString();
	mSigningKeys = (ArraySet<PublicKey>) dest.readArraySet(boot);		mSigningKeys = (ArraySet<PublicKey>) dest.readArraySet(boot);
	mUpgradeKeySets = (ArraySet<String>) dest.readArraySet(boot);		mUpgradeKeySets = (ArraySet<String>) dest.readArraySet(boot);

	@@ -6581,6 +6598,8 @@ public class PackageParser {
	dest.writeInt(mOverlayPriority);		dest.writeInt(mOverlayPriority);
	dest.writeInt(mIsStaticOverlay ? 1 : 0);		dest.writeInt(mIsStaticOverlay ? 1 : 0);
	dest.writeInt(mTrustedOverlay ? 1 : 0);		dest.writeInt(mTrustedOverlay ? 1 : 0);
			dest.writeInt(mCompileSdkVersion);
			dest.writeString(mCompileSdkVersionCodename);
	dest.writeArraySet(mSigningKeys);		dest.writeArraySet(mSigningKeys);
	dest.writeArraySet(mUpgradeKeySets);		dest.writeArraySet(mUpgradeKeySets);
	writeKeySetMapping(dest, mKeySetMapping);		writeKeySetMapping(dest, mKeySetMapping);

core/res/res/layout/unsupported_compile_sdk_dialog_content.xml

0 → 100644

+31 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!--
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			-->

			<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:paddingTop="?attr/dialogPreferredPadding"
			android:paddingLeft="?attr/dialogPreferredPadding"
			android:paddingRight="?attr/dialogPreferredPadding">

			<CheckBox
			android:id="@+id/ask_checkbox"
			android:layout_width="wrap_content"
			android:layout_height="wrap_content"
			android:layout_gravity="start"
			android:text="@string/unsupported_compile_sdk_show" />
			</FrameLayout>

core/res/res/values/attrs_manifest.xml

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1340,6 +1340,23 @@
	<p>The default value of this attribute is <code>1</code>. -->		<p>The default value of this attribute is <code>1</code>. -->
	<attr name="targetSandboxVersion" format="integer" />		<attr name="targetSandboxVersion" format="integer" />

			<!-- The user-visible SDK version (ex. 26) of the framework against which the application was
			compiled. This attribute is automatically specified by the Android build tools and should
			NOT be manually specified.
			<p>
			This attribute is the compile-time equivalent of
			{@link android.os.Build.VERSION#SDK_INT Build.VERSION.SDK_INT}. -->
			<attr name="compileSdkVersion" format="integer" />

			<!-- The development codename (ex. "O") of the framework against which the application was
			compiled, or "REL" if the application was compiled against a release build. This attribute
			is automatically specified by the Android build tools and should NOT be manually
			specified.
			<p>
			This attribute is the compile-time equivalent of
			{@link android.os.Build.VERSION#CODENAME Build.VERSION.CODENAME}. -->
			<attr name="compileSdkVersionCodename" format="string" />

	<!-- The <code>manifest</code> tag is the root of an		<!-- The <code>manifest</code> tag is the root of an
	<code>AndroidManifest.xml</code> file,		<code>AndroidManifest.xml</code> file,
	describing the contents of an Android package (.apk) file. One		describing the contents of an Android package (.apk) file. One
	@@ -1369,6 +1386,8 @@
	<attr name="isolatedSplits" />		<attr name="isolatedSplits" />
	<attr name="isFeatureSplit" />		<attr name="isFeatureSplit" />
	<attr name="targetSandboxVersion" />		<attr name="targetSandboxVersion" />
			<attr name="compileSdkVersion" />
			<attr name="compileSdkVersionCodename" />
	</declare-styleable>		</declare-styleable>

	<!-- The <code>application</code> tag describes application-level components		<!-- The <code>application</code> tag describes application-level components