aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2016-09-26 14:52:42 -0500
committerElliott Hughes2016-09-26 14:53:52 -0500
commit130f6c86f590b61bc3aef7883500eb4c0ba593c3 (patch)
tree2577e80d8cac345ac5aec61d6af6d0e2d7c0c862 /wear_ui.cpp
parentc8db4817809e163d887f7955a03ad0f97159f12b (diff)
parentd5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5 (diff)
downloadplatform-bootable-recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.gz
platform-bootable-recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.xz
platform-bootable-recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.zip
resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp
Change-Id: Ia041044547351a3e65b647bb9913aa18c7d2c97c
Diffstat (limited to 'wear_ui.cpp')
-rw-r--r--wear_ui.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/wear_ui.cpp b/wear_ui.cpp
index 3ea1060e..0918ac45 100644
--- a/wear_ui.cpp
+++ b/wear_ui.cpp
@@ -30,7 +30,7 @@
30#include "common.h" 30#include "common.h"
31#include "device.h" 31#include "device.h"
32#include "wear_ui.h" 32#include "wear_ui.h"
33#include "cutils/properties.h" 33#include "android-base/properties.h"
34#include "android-base/strings.h" 34#include "android-base/strings.h"
35#include "android-base/stringprintf.h" 35#include "android-base/stringprintf.h"
36 36
@@ -119,8 +119,8 @@ void WearRecoveryUI::draw_screen_locked()
119 int y = outer_height; 119 int y = outer_height;
120 int x = outer_width; 120 int x = outer_width;
121 if (show_menu) { 121 if (show_menu) {
122 char recovery_fingerprint[PROPERTY_VALUE_MAX]; 122 std::string recovery_fingerprint =
123 property_get("ro.bootimage.build.fingerprint", recovery_fingerprint, ""); 123 android::base::GetProperty("ro.bootimage.build.fingerprint", "");
124 SetColor(HEADER); 124 SetColor(HEADER);
125 DrawTextLine(x + 4, &y, "Android Recovery", true); 125 DrawTextLine(x + 4, &y, "Android Recovery", true);
126 for (auto& chunk: android::base::Split(recovery_fingerprint, ":")) { 126 for (auto& chunk: android::base::Split(recovery_fingerprint, ":")) {