Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c3f7dd9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Temporarily disable unsupported sdk warning for P during... 

Merge "DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization" into pi-dev
parents 2c14da40 52788fc7

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -122,8 +122,9 @@ class AppWarnings { 
            return;

            return;

        }

        }





        if (ActivityManager.isRunningInTestHarness()

        // TODO(b/77862563): temp. fix while P is being finalized.  To be reverted

                && !mAlwaysShowUnsupportedCompileSdkWarningActivities.contains(r.realActivity)) {

        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

            // Don't show warning if we are running in a test harness and we don't have to always

            // show for this activity.

            // show for this activity.

            return;

            return;