diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2020-01-08 15:24:53 -0800 |
|---|---|---|
| committer | Muhammad Qureshi <muhammadq@google.com> | 2020-01-08 16:10:57 -0800 |
| commit | b6f32d9fe2e220bce8395390862dbf1b935881d6 (patch) | |
| tree | 924cef1d460a451f7eeb13a094fcd5bbb04b2a32 /tools/stats_log_api_gen/java_writer.cpp | |
| parent | f7f6200c6a7b65ead1d2ff311006a5620e8a385f (diff) | |
Use preview_sdk_int for version code checks
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
Diffstat (limited to 'tools/stats_log_api_gen/java_writer.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/java_writer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/stats_log_api_gen/java_writer.cpp b/tools/stats_log_api_gen/java_writer.cpp index 7f0872c02613..7fa47f696b50 100644 --- a/tools/stats_log_api_gen/java_writer.cpp +++ b/tools/stats_log_api_gen/java_writer.cpp @@ -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 = " "; } |