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

This commit is contained in:
TreeHugger Robot
2018-04-10 21:49:17 +00:00
committed by Android (Google) Code Review

View File

@@ -122,8 +122,9 @@ class AppWarnings {
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;