diff options
| author | 2021-08-17 02:56:42 +0000 | |
|---|---|---|
| committer | 2021-08-17 02:56:50 +0000 | |
| commit | 3f46e5ff56fc137d087dfcf172f75d5a0f3b3adb (patch) | |
| tree | dba301611620e672a062e33fa244baa9e5f6b039 | |
| parent | a4bb90845e0a31dc71e92440c3a57bf357cbf233 (diff) | |
Fix isAtLeastS failed on SCV2 and master
Bug: 196388694
Change-Id: Ia86664ee875d428c4b98d48e9aa0218ea4d94009
Test: manual
| -rw-r--r-- | packages/SettingsLib/Utils/src/com/android/settingslib/utils/BuildCompatUtils.java | 6 |
1 files 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 44f6f5439af3..9dcb5bc8c7fa 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() {} |