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 <jni.h> | 5 #include <jni.h> |
6 #include <sys/system_properties.h> | 6 #include <sys/system_properties.h> |
7 | 7 |
8 #include "sync/util/session_utils_android.h" | 8 #include "sync/util/session_utils_android.h" |
9 | 9 |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 GetAndroidIdJNI(env, GetContentResolver(env)); | 60 GetAndroidIdJNI(env, GetContentResolver(env)); |
61 return ConvertJavaStringToUTF8(android_id); | 61 return ConvertJavaStringToUTF8(android_id); |
62 } | 62 } |
63 | 63 |
64 std::string GetModel() { | 64 std::string GetModel() { |
65 char model[PROP_VALUE_MAX]; | 65 char model[PROP_VALUE_MAX]; |
66 __system_property_get("ro.product.model", model); | 66 __system_property_get("ro.product.model", model); |
67 return model; | 67 return model; |
68 } | 68 } |
69 | 69 |
70 bool IsTabletUi() { | |
71 NOTIMPLEMENTED() << "TODO(yfriedman): Upstream this"; | |
72 return true; | |
73 } | |
74 | |
75 } // namespace internal | 70 } // namespace internal |
76 } // namespace syncer | 71 } // namespace syncer |
OLD | NEW |