OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/android/build_info.h" | 5 #include "base/android/build_info.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 } | 37 } |
38 | 38 |
39 static const bool kRegisterAtExit = false; | 39 static const bool kRegisterAtExit = false; |
40 #ifndef NDEBUG | 40 #ifndef NDEBUG |
41 static const bool kAllowedToAccessOnNonjoinableThread = true; | 41 static const bool kAllowedToAccessOnNonjoinableThread = true; |
42 #endif | 42 #endif |
43 }; | 43 }; |
44 | 44 |
45 BuildInfo::BuildInfo(JNIEnv* env) | 45 BuildInfo::BuildInfo(JNIEnv* env) |
46 : device_(StrDupJString(Java_BuildInfo_getDevice(env))), | 46 : device_(StrDupJString(Java_BuildInfo_getDevice(env))), |
| 47 manufacturer_(StrDupJString(Java_BuildInfo_getDeviceManufacturer(env))), |
47 model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))), | 48 model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))), |
48 brand_(StrDupJString(Java_BuildInfo_getBrand(env))), | 49 brand_(StrDupJString(Java_BuildInfo_getBrand(env))), |
49 android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))), | 50 android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))), |
50 android_build_fp_(StrDupJString( | 51 android_build_fp_(StrDupJString( |
51 Java_BuildInfo_getAndroidBuildFingerprint(env))), | 52 Java_BuildInfo_getAndroidBuildFingerprint(env))), |
52 package_version_code_(StrDupJString(Java_BuildInfo_getPackageVersionCode( | 53 package_version_code_(StrDupJString(Java_BuildInfo_getPackageVersionCode( |
53 env, GetApplicationContext()))), | 54 env, GetApplicationContext()))), |
54 package_version_name_(StrDupJString(Java_BuildInfo_getPackageVersionName( | 55 package_version_name_(StrDupJString(Java_BuildInfo_getPackageVersionName( |
55 env, GetApplicationContext()))), | 56 env, GetApplicationContext()))), |
56 package_label_(StrDupJString(Java_BuildInfo_getPackageLabel( | 57 package_label_(StrDupJString(Java_BuildInfo_getPackageLabel( |
(...skipping 15 matching lines...) Expand all Loading... |
72 java_exception_info_ = strndup(info.c_str(), 4096); | 73 java_exception_info_ = strndup(info.c_str(), 4096); |
73 } | 74 } |
74 | 75 |
75 // static | 76 // static |
76 bool BuildInfo::RegisterBindings(JNIEnv* env) { | 77 bool BuildInfo::RegisterBindings(JNIEnv* env) { |
77 return RegisterNativesImpl(env); | 78 return RegisterNativesImpl(env); |
78 } | 79 } |
79 | 80 |
80 } // namespace android | 81 } // namespace android |
81 } // namespace base | 82 } // namespace base |
OLD | NEW |