From 9017382b77d4f5b9287de8527a7e9bf70fe26ee4 Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Tue, 17 Aug 2021 02:56:42 +0000 Subject: [PATCH] Fix isAtLeastS failed on SCV2 and master Bug: 196388694 Change-Id: Ia86664ee875d428c4b98d48e9aa0218ea4d94009 Test: manual (cherry picked from commit 3f46e5ff56fc137d087dfcf172f75d5a0f3b3adb) --- .../src/com/android/settingslib/utils/BuildCompatUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java index 44f6f5439af3e..9dcb5bc8c7fa6 100644 --- a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java +++ b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java @@ -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() {}