Add Android SDK version to crash reports.

Bug: 911669
Change-Id: I62a97d76a0b88099a5a42b93463307f03be9b3e2
Reviewed-on: https://chromium-review.googlesource.com/c/1361104Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615851}

chrome/android/java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java

@@ -42,6 +42,7 @@ public class PureJavaExceptionReporter {
     public static final String PRODUCT = "prod";
     public static final String ANDROID_BUILD_ID = "android_build_id";
     public static final String ANDROID_BUILD_FP = "android_build_fp";
+    public static final String SDK = "sdk";
     public static final String DEVICE = "device";
     public static final String GMS_CORE_VERSION = "gms_core_version";
     public static final String INSTALLER_PACKAGE_NAME = "installer_package_name";
@@ -136,6 +137,7 @@ public class PureJavaExceptionReporter {
         addPairedString(BRAND, Build.BRAND);
         addPairedString(BOARD, Build.BOARD);
         addPairedString(ANDROID_BUILD_FP, buildInfo.androidBuildFingerprint);
+        addPairedString(SDK, String.valueOf(Build.VERSION.SDK_INT));
         addPairedString(GMS_CORE_VERSION, buildInfo.gmsVersionCode);
         addPairedString(INSTALLER_PACKAGE_NAME, buildInfo.installerPackageName);
         addPairedString(ABI_NAME, buildInfo.abiString);

chrome/android/javatests/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporterTest.java

@@ -55,7 +55,8 @@ public class PureJavaExceptionReporterTest {
     private static final String[] REPORT_FIELDS = {PureJavaExceptionReporter.CHANNEL,
             PureJavaExceptionReporter.VERSION, PureJavaExceptionReporter.PRODUCT,
             PureJavaExceptionReporter.ANDROID_BUILD_ID, PureJavaExceptionReporter.ANDROID_BUILD_FP,
-            PureJavaExceptionReporter.DEVICE, PureJavaExceptionReporter.GMS_CORE_VERSION,
+            PureJavaExceptionReporter.SDK, PureJavaExceptionReporter.DEVICE,
+            PureJavaExceptionReporter.GMS_CORE_VERSION,
             PureJavaExceptionReporter.INSTALLER_PACKAGE_NAME, PureJavaExceptionReporter.ABI_NAME,
             PureJavaExceptionReporter.PACKAGE, PureJavaExceptionReporter.MODEL,
             PureJavaExceptionReporter.BRAND, PureJavaExceptionReporter.BOARD,

components/crash/content/app/crashpad_linux.cc

@@ -200,6 +200,7 @@ void SetBuildInfoAnnotations(std::map<std::string, std::string>* annotations) {
 
   (*annotations)["android_build_id"] = info->android_build_id();
   (*annotations)["android_build_fp"] = info->android_build_fp();
+  (*annotations)["sdk"] = base::StringPrintf("%d", info->sdk_int());
   (*annotations)["device"] = info->device();
   (*annotations)["model"] = info->model();
   (*annotations)["brand"] = info->brand();