Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use preview_sdk_int for version code checks

Browse Source 
Don't use Build.VERSION.CODENAME to check for R.
Use Build.VERSION.SDK_INT > Q || (Build.VERSION.SDK_INT == Q &&
        Build.VERSION.PREVIEW_SDK_INT > 0)

Bug: 146235828
Test: m DocumentsUIGoogle

Change-Id: I59e327d4e92d41a93b6bea145b8497fd4f85108c
Merged-In: I59e327d4e92d41a93b6bea145b8497fd4f85108c
(cherry picked from commit b6f32d9fe2)
This commit is contained in:
Muhammad Qureshi
2020-01-08 15:24:53 -08:00
parent 38812f345c
commit 0c8cdf54db
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/stats_log_api_gen/java_writer.cpp
View File

@@ -85,8 +85,9 @@ static int write_java_methods(
string indent("");
if (supportQ) {
// TODO(b/146235828): Use just SDK_INT check once it is incremented from Q.
fprintf(out, " if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q ||\n");
fprintf(out, " Build.VERSION.CODENAME.equals(\"R\")) {\n");
fprintf(out, " if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q\n");
fprintf(out, " || (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q\n");
fprintf(out, " && Build.VERSION.PREVIEW_SDK_INT > 0)) {\n");
indent = " ";
}