aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2016-03-02 10:01:02 -0800
committerAlex Vakulenko <avakulenko@google.com>2016-03-02 10:01:02 -0800
commita0ff2eccb34362a7c336284599b5bbbbebf49398 (patch)
tree9386946f41b232951c02c1954977b9d7b4cf298c
parent20f03a2966652cf76ea2e7449cebaedb6b457acc (diff)
downloadweaved-a0ff2eccb34362a7c336284599b5bbbbebf49398.tar.gz
Remove clang warning in unit testsandroid-n-preview-1
The new clang compiler compains about |state| and |origin| possibly being uninitialized if StringToEnum fails. There is no harm of initializing them to some default values... BUG: 27437721 Change-Id: If8062a337d5530223fcab6480bbbeab257893d08
-rw-r--r--buffet/binder_command_proxy_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/buffet/binder_command_proxy_unittest.cc b/buffet/binder_command_proxy_unittest.cc
index 0905440..2ba083a 100644
--- a/buffet/binder_command_proxy_unittest.cc
+++ b/buffet/binder_command_proxy_unittest.cc
@@ -84,7 +84,7 @@ class BinderCommandProxyTest : public ::testing::Test {
BinderCommandProxy* GetCommandProxy() const { return proxy_.get(); }
weave::Command::State GetCommandState() const {
- weave::Command::State state;
+ weave::Command::State state = weave::Command::State::kAborted;
android::String16 state_string;
EXPECT_TRUE(GetCommandProxy()->getState(&state_string).isOk());
EXPECT_TRUE(StringToEnum(ToString(state_string), &state));
@@ -92,7 +92,7 @@ class BinderCommandProxyTest : public ::testing::Test {
}
weave::Command::Origin GetCommandOrigin() const {
- weave::Command::Origin origin;
+ weave::Command::Origin origin = weave::Command::Origin::kCloud;
android::String16 origin_string;
EXPECT_TRUE(GetCommandProxy()->getOrigin(&origin_string).isOk());
EXPECT_TRUE(StringToEnum(ToString(origin_string), &origin));