commit 0b94e6b49e653dfcb749dd6873a04902633e97ab
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 09 01:38:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 09 01:38:35 2020 +0000
tree 3d10d2e67fd39a0d8fe8345899cfa47f80f0bcc4
parent b023c08b6580acbaef92f88c5dc4e8e6ec1fb91e
parent b6f32d9fe2e220bce8395390862dbf1b935881d6

Merge "Use preview_sdk_int for version code checks"

tools/stats_log_api_gen/java_writer.cpp

diff --git a/tools/stats_log_api_gen/java_writer.cpp b/tools/stats_log_api_gen/java_writer.cpp
index 7f0872c..7fa47f6 100644
--- a/tools/stats_log_api_gen/java_writer.cpp
+++ b/tools/stats_log_api_gen/java_writer.cpp
@@ -85,8 +85,9 @@
         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 = "    ";
         }