Merge "Temporarily disable unsupported sdk warning for Q" (b4dc8531) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/AppWarnings.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -122,16 +122,16 @@ class AppWarnings {
		return;
		}

		final int platformSdk = Build.VERSION.SDK_INT;

		if (ActivityManager.isRunningInTestHarness()
		\|\| platformSdk == Build.VERSION_CODES.CUR_DEVELOPMENT) {
		// Don't show warning if we are running in a test harness or the platform is currently
		// in development, expect if we were requested to always show it for this activity.
		if (!mAlwaysShowUnsupportedCompileSdkWarningActivities.contains(r.realActivity)) {

		// TODO(b/75318890): temp. fix to get q dogfoodable. Need to move this to when the app
		// actually crashes.
		if (/*ActivityManager.isRunningInTestHarness()
		&&*/ !mAlwaysShowUnsupportedCompileSdkWarningActivities.contains(r.realActivity)) {
		// Don't show warning if we are running in a test harness and we don't have to always
		// show for this activity.
		return;
		}
		}

		// If the application was built against an pre-release SDK that's older than the current
		// platform OR if the current platform is pre-release and older than the SDK against which
		@@ -139,6 +139,7 @@ class AppWarnings {
		// codenames (e.g. simultaneous pre-release development), then we're likely to run into
		// compatibility issues. Warn the user and offer to check for an update.
		final int compileSdk = r.appInfo.compileSdkVersion;
		final int platformSdk = Build.VERSION.SDK_INT;
		final boolean isCompileSdkPreview = !"REL".equals(r.appInfo.compileSdkVersionCodename);
		final boolean isPlatformSdkPreview = !"REL".equals(Build.VERSION.CODENAME);
		if ((isCompileSdkPreview && compileSdk < platformSdk)