commit 207e66ecca9828a341b2968848d4d20be1b2532c
author Ian Pedowitz <ijpedowitz@google.com> Tue Apr 10 15:05:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 10 15:05:42 2018 -0700
tree a0181720d465ebf279c31360229c38057b4a0806
parent 979960dd9f74330579fd35b46c5544972a5744b6
parent 7c3f7dd9a5e5ba84aa131c9d2caaec920a790a9b

Merge "DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization" into pi-dev
am: 7c3f7dd9a5

Change-Id: Ib21b3fdef4c29e43ff385fa3fce5491b381b8530

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

diff --git a/services/core/java/com/android/server/am/AppWarnings.java b/services/core/java/com/android/server/am/AppWarnings.java
index ab1d7bf..ea0251e 100644
--- a/services/core/java/com/android/server/am/AppWarnings.java
+++ b/services/core/java/com/android/server/am/AppWarnings.java
@@ -122,8 +122,9 @@
             return;
         }
 
-        if (ActivityManager.isRunningInTestHarness()
-                && !mAlwaysShowUnsupportedCompileSdkWarningActivities.contains(r.realActivity)) {
+        // TODO(b/77862563): temp. fix while P is being finalized.  To be reverted
+        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;