From 2830dd72e2acfa5512351e1565cf50e1b111d4eb Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Thu, 5 Apr 2018 10:35:38 -0700 Subject: [PATCH] Temporarily disable unsupported sdk warning for Q Work around to make Q dogfoodable until we have time to move the functionality to when the app actually crashes. Bug: 75318890 Test: see app warnings without the patch. no app warnings visible when patch is applied. for example: flash device, launch apps from appbar: messages, play, chrome, camera. Change-Id: I596d4e65a276b717aefb3c390cd1172850b03068 --- .../java/com/android/server/am/AppWarnings.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/am/AppWarnings.java b/services/core/java/com/android/server/am/AppWarnings.java index 59c9bf91c2b28..9f7db7b654aa7 100644 --- a/services/core/java/com/android/server/am/AppWarnings.java +++ b/services/core/java/com/android/server/am/AppWarnings.java @@ -122,15 +122,15 @@ 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)) { - return; - } + + // 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 @@ -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)