Merge "Use proper platform version checks (apigen)" into rvc-dev am: 0bb978de88 am: 79e5389451

Change-Id: I14ed9563e3ca5b5f1841c109b1ae431451dddf52
This commit is contained in:
Ruchir Rastogi
2020-05-08 16:18:44 +00:00
committed by Automerger Merge Worker

View File

@@ -124,13 +124,7 @@ static int write_java_methods(FILE* out, const SignatureInfoMap& signatureInfoMa
// Print method body.
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.SDK_INT == "
"Build.VERSION_CODES.Q\n");
fprintf(out, " && Build.VERSION.PREVIEW_SDK_INT > 0)) {\n");
fprintf(out, " if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {\n");
indent = " ";
}