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

Commit 391c446b authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Android (Google) Code Review
Browse files

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
parents 59f70c03 a387719d

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;

    }