Commit 0b79a6d0 authored May 07, 2021 by Zemiao Zhu Committed by Automerger Merge Worker May 07, 2021

Merge "Fix test error 'No static method isAtLeastS()' by adding reference in...

Merge "Fix test error 'No static method isAtLeastS()' by adding reference in production code." into sc-dev am: 391c446b am: ed11b0e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/14456922

Change-Id: Ib4b3805f1cdf2fca84d099c1b26f9ebad8fdfae1

src/com/android/documentsui/util/VersionUtils.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@ public class VersionUtils {
		* Returns whether the device is running on Android R or newer.
		*/
		public static boolean isAtLeastR() {
		return Build.VERSION.CODENAME.equals("R")
		return isAtLeastS() // Keep reference to isAtLeastS() so it's not stripped from test apk
		\|\| Build.VERSION.CODENAME.equals("R")
		\|\| Build.VERSION.SDK_INT >= 30;
		}