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

Commit 3aa94ca2 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix isAtLeastS failed on SCV2 and master" into sc-v2-dev

parents 1524da94 9017382b

packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ public final class BuildCompatUtils { 
        }



        return (VERSION.CODENAME.equals("REL") && VERSION.SDK_INT >= 31)

                || (VERSION.CODENAME.length() == 1

                && VERSION.CODENAME.compareTo("S") >= 0

                && VERSION.CODENAME.compareTo("Z") <= 0);

                || (VERSION.CODENAME.length() >= 1

                && VERSION.CODENAME.toUpperCase().charAt(0) >= 'S'

                && VERSION.CODENAME.toUpperCase().charAt(0) <= 'Z');

    }



    private BuildCompatUtils() {}