diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-05 19:47:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-05 19:47:34 +0000 |
| commit | a754dc745cc801ce0d64f0d9149eedca6bf3bdfa (patch) | |
| tree | dad6d1ddb7481be80cea653a6a97f7d96fdaab5a | |
| parent | 0232989938fef9a43e830058836686306f392503 (diff) | |
| parent | 0faa9a7571c34d582940368dc4bda05dcbfb9abd (diff) | |
| download | modules-utils-a754dc745cc801ce0d64f0d9149eedca6bf3bdfa.tar.gz | |
Merge "simplify IsAtLeastU()" into main
| -rw-r--r-- | build/include/android-modules-utils/sdk_level.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/build/include/android-modules-utils/sdk_level.h b/build/include/android-modules-utils/sdk_level.h index bbb1cfb..473fac8 100644 --- a/build/include/android-modules-utils/sdk_level.h +++ b/build/include/android-modules-utils/sdk_level.h @@ -54,11 +54,7 @@ inline bool IsAtLeastS() { return android_get_device_api_level() >= 31; } inline bool IsAtLeastT() { return android_get_device_api_level() >= 33; } // Checks if the device is running on release version of Android U or newer. -inline bool IsAtLeastU() { - return android_get_device_api_level() >= 34 || - (android_get_device_api_level() == 33 && - detail::IsAtLeastPreReleaseCodename("U")); -} +inline bool IsAtLeastU() { return android_get_device_api_level() >= 34; } // Checks if the device is running on release version of Android V or newer. inline bool IsAtLeastV() { |