From fa9dbe32915d8f4392a2c3417d33cec09f17e1ae Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Mon, 27 Mar 2023 18:24:44 +0000 Subject: [PATCH] Fix lint error in errorprone target (only in tm-qpr-dev) Bug: 275111546 Test: m out/soong/.intermediates/packages/apps/Launcher3/Launcher3/android_common/lint/lint-baseline.xml Before: https://paste.googleplex.com/6542806926491648 After: https://paste.googleplex.com/5015617085112320 Change-Id: If486407303b81a38b4a35979e442299f33fa49b2 --- src/com/android/launcher3/views/ActivityContext.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java index 10f40b7124..a6744fb02a 100644 --- a/src/com/android/launcher3/views/ActivityContext.java +++ b/src/com/android/launcher3/views/ActivityContext.java @@ -324,8 +324,9 @@ public interface ActivityContext { Bundle optsBundle = null; if (v != null) { optsBundle = getActivityLaunchOptions(v, item).toBundle(); - } else if (item != null && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON - && Utilities.ATLEAST_T) { + } else if (android.os.Build.VERSION.SDK_INT >= 33 + && item != null + && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON) { optsBundle = ActivityOptions.makeBasic() .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR).toBundle(); }