Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: base/android/build_info.cc

Issue 10908271: Add package label to base::android::BuildInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/android/build_info.h ('k') | base/android/java/src/org/chromium/base/BuildInfo.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 : device_(StrDupJString(Java_BuildInfo_getDevice(env))), 44 : device_(StrDupJString(Java_BuildInfo_getDevice(env))),
45 model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))), 45 model_(StrDupJString(Java_BuildInfo_getDeviceModel(env))),
46 brand_(StrDupJString(Java_BuildInfo_getBrand(env))), 46 brand_(StrDupJString(Java_BuildInfo_getBrand(env))),
47 android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))), 47 android_build_id_(StrDupJString(Java_BuildInfo_getAndroidBuildId(env))),
48 android_build_fp_(StrDupJString( 48 android_build_fp_(StrDupJString(
49 Java_BuildInfo_getAndroidBuildFingerprint(env))), 49 Java_BuildInfo_getAndroidBuildFingerprint(env))),
50 package_version_code_(StrDupJString(Java_BuildInfo_getPackageVersionCode( 50 package_version_code_(StrDupJString(Java_BuildInfo_getPackageVersionCode(
51 env, GetApplicationContext()))), 51 env, GetApplicationContext()))),
52 package_version_name_(StrDupJString(Java_BuildInfo_getPackageVersionName( 52 package_version_name_(StrDupJString(Java_BuildInfo_getPackageVersionName(
53 env, GetApplicationContext()))), 53 env, GetApplicationContext()))),
54 package_label_(StrDupJString(Java_BuildInfo_getPackageLabel(
55 env, GetApplicationContext()))),
54 java_exception_info_(NULL) { 56 java_exception_info_(NULL) {
55 } 57 }
56 58
57 // static 59 // static
58 BuildInfo* BuildInfo::GetInstance() { 60 BuildInfo* BuildInfo::GetInstance() {
59 return Singleton<BuildInfo, BuildInfoSingletonTraits >::get(); 61 return Singleton<BuildInfo, BuildInfoSingletonTraits >::get();
60 } 62 }
61 63
62 void BuildInfo::set_java_exception_info(const std::string& info) { 64 void BuildInfo::set_java_exception_info(const std::string& info) {
63 DCHECK(!java_exception_info_) << "info should be set only once."; 65 DCHECK(!java_exception_info_) << "info should be set only once.";
64 java_exception_info_ = strndup(info.c_str(), 1024); 66 java_exception_info_ = strndup(info.c_str(), 1024);
65 } 67 }
66 68
67 // static 69 // static
68 bool BuildInfo::RegisterBindings(JNIEnv* env) { 70 bool BuildInfo::RegisterBindings(JNIEnv* env) {
69 return RegisterNativesImpl(env); 71 return RegisterNativesImpl(env);
70 } 72 }
71 73
72 } // namespace android 74 } // namespace android
73 } // namespace base 75 } // namespace base
OLDNEW
« no previous file with comments | « base/android/build_info.h ('k') | base/android/java/src/org/chromium/base/BuildInfo.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698