Upstream native crash handling changes for Android.

base/android/build_info.cc

Index: base/android/build_info.cc
diff --git a/base/android/build_info.cc b/base/android/build_info.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5b97e0864a8a38ec34016b237c159905e7171ffb
--- /dev/null
+++ b/base/android/build_info.cc
@@ -0,0 +1,104 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.

[Mark Mentovai, 2012/04/05 14:28:03]

2012

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/android/build_info.h"
+
+#include <string>
+
+#include "base/logging.h"
+#include "base/android/jni_android.h"

[Mark Mentovai, 2012/04/05 14:28:03]

Sort. android < logging.

[carlosvaldivia, 2012/04/05 18:35:56]

Done.

+#include "base/android/jni_string.h"
+#include "base/android/scoped_java_ref.h"
+
+#include "jni/build_info_jni.h"

[Mark Mentovai, 2012/04/05 14:28:03]

Why is this in a separate section?

[carlosvaldivia, 2012/04/05 18:35:56]

Done.

+
+namespace base {
+namespace android {
+
+BuildInfo* BuildInfo::instance_ = NULL;
+
+BuildInfo::BuildInfo(
+    const char* device,
+    const char* model,
+    const char* brand,
+    const char* android_build_id,
+    const char* android_build_fp,
+    const char* package_version_code,
+    const char* package_version_name)
+    : device(device),
+      model(model),
+      brand(brand),
+      android_build_id(android_build_id),
+      android_build_fp(android_build_fp),
+      package_version_code(package_version_code),
+      package_version_name(package_version_name) {
+}
+
+const BuildInfo* const BuildInfo::GetInstance() {
+  if (!instance_) {
+    JNIEnv* env = AttachCurrentThread();
+    jobject app_context = GetApplicationContext();

[Mark Mentovai, 2012/04/05 14:28:03]

You don’t need to call this ’til you need it, which looks like it happens at
about line 68.

+
+    // The const char* pointers initialized below will be owned by the
+    // resultant BuildInfo.
+    std::string device_str =
+        ConvertJavaStringToUTF8(Java_BuildInfo_getDevice(env));
+    const char* device = strdup(device_str.c_str());

[Mark Mentovai, 2012/04/05 14:28:03]

#include <string.h> to be able to call strdup.

[carlosvaldivia, 2012/04/05 18:35:56]

Done.

+
+    std::string model_str =
+        ConvertJavaStringToUTF8(Java_BuildInfo_getDeviceModel(env));
+    const char* model = strdup(model_str.c_str());
+
+    std::string brand_str =
+        ConvertJavaStringToUTF8(Java_BuildInfo_getBrand(env));
+    const char* brand = strdup(brand_str.c_str());
+
+    std::string android_build_id_str =
+        ConvertJavaStringToUTF8(Java_BuildInfo_getAndroidBuildId(env));
+    const char* android_build_id = strdup(android_build_id_str.c_str());
+
+    std::string android_build_fp_str =
+        ConvertJavaStringToUTF8(
+            Java_BuildInfo_getAndroidBuildFingerprint(env));
+    const char* android_build_fp = strdup(android_build_fp_str.c_str());
+
+    std::string package_version_code_str =
+        ConvertJavaStringToUTF8(Java_BuildInfo_getPackageVersionCode(
+            env, app_context));
+    const char* package_version_code =
+        strdup(package_version_code_str.c_str());
+
+    std::string package_version_name_str =
+        ConvertJavaStringToUTF8(
+            Java_BuildInfo_getPackageVersionName(env, app_context));
+    const char* package_version_name =
+        strdup(package_version_name_str.c_str());
+
+    instance_ = new BuildInfo(
+        device,
+        model,
+        brand,
+        android_build_id,
+        android_build_fp,
+        package_version_code,
+        package_version_name);
+
+    LOG(INFO) << "BuildInfo instance initialized with"

[Mark Mentovai, 2012/04/05 14:28:03]

This doesn’t seem necessary.

[carlosvaldivia, 2012/04/05 18:35:56]

Done.

+              << " device=" << instance_->device
+              << " model=" << instance_->model
+              << " brand=" << instance_->brand
+              << " android_build_id=" << instance_->android_build_id
+              << " android_build_fp=" << instance_->android_build_fp
+              << " package_version_code=" << instance_->package_version_code
+              << " package_version_name=" << instance_->package_version_name;
+  }
+  return instance_;
+}
+
+bool RegisterBuildInfo(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+}  // namespace android
+}  // namespace base