Add package field to Android crash reports

components/crash/content/app/breakpad_linux.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // For linux_syscall_support.h. This makes it safe to call embedded system
 // calls when in seccomp mode.
 
 #include "components/crash/content/app/breakpad_linux.h"
 
 #include <fcntl.h>
@@ skipping 543 matching lines @@
 
   AddString(filename_msg);
   AddString(g_sep);
   AddItem(data, data_len);
   AddString(g_sep);
   AddItem(file_data, file_size);
   Flush();
 }
 #endif  // defined(OS_CHROMEOS)
 
+#if defined(OS_ANDROID)
+// Writes the "package" field, which is in the format:
+// $PACKAGE_NAME v$VERSION_CODE ($VERSION_NAME)
+void WriteAndroidPackage(MimeWriter& writer,
+                         base::android::BuildInfo* android_build_info) {
+  static const char package[] = "package";
+  // The actual size limits on packageId and versionName are quite generous.
+  // Limit to a reasonable size rather than allocating theoretical limits.
+  const int kMaxSize = 1024;
+  char buf[kMaxSize];
+
+  my_strlcpy(buf, android_build_info->package_name(), kMaxSize);

[scottmg, 2017/01/11 02:47:41]

Comment here why it's not just using sprintf.

[agrieve, 2017/01/12 02:13:09]

Done.

+  my_strlcat(buf, " v", kMaxSize - my_strlen(buf));

[scottmg, 2017/01/11 02:47:41]

I believe strlcat and strlcpy normally take the full size of the buffer to avoid
this sort of error-prone code. Is is necessary to subtract the current buffer
length here each time?

[agrieve, 2017/01/12 02:13:09]

Aha, that's much nicer :)

+  my_strlcat(buf, android_build_info->package_version_code(),
+             kMaxSize - my_strlen(buf));
+  my_strlcat(buf, " (", kMaxSize - my_strlen(buf));
+  my_strlcat(buf, android_build_info->package_version_name(),
+             kMaxSize - my_strlen(buf));
+  my_strlcat(buf, ")", kMaxSize - my_strlen(buf));
+
+  writer.AddPairString(package, buf);
+}
+#endif  // defined(OS_ANDROID)
+
 void DumpProcess() {
   if (g_breakpad)
     g_breakpad->WriteMinidump();
 
 #if defined(OS_ANDROID)
   // If microdumps are enabled write also a microdump on the system log.
   if (g_microdump)
     g_microdump->WriteMinidump();
 #endif
 }
@@ skipping 1076 matching lines @@
     writer.AddBoundary();
     writer.AddPairString(device, android_build_info->device());
     writer.AddBoundary();
     writer.AddPairString(model, android_build_info->model());
     writer.AddBoundary();
     writer.AddPairString(brand, android_build_info->brand());
     writer.AddBoundary();
     writer.AddPairString(gms_core_version,
         android_build_info->gms_version_code());
     writer.AddBoundary();
+    WriteAndroidPackage(writer, android_build_info);
+    writer.AddBoundary();
     if (android_build_info->java_exception_info() != nullptr) {
       writer.AddPairString(exception_info,
                            android_build_info->java_exception_info());
       writer.AddBoundary();
     }
 #endif
     writer.Flush();
   }
 
   if (info.process_start_time > 0) {
@@ skipping 297 matching lines @@
 void SetNativeCodeTextAddrRange(uintptr_t start, uintptr_t end) {
   g_microdump_info.Get().SetMicrodumpInterestRange(start, end);
 }
 #endif  // OS_ANDROID
 
 bool IsCrashReporterEnabled() {
   return g_is_crash_reporter_enabled;
 }
 
 }  // namespace breakpad