commit aaaebd9afd4c0d2c6d3f4ae12e8acbe8971438bd
author Ivan Lozano <ivanlozano@google.com> Fri Nov 10 02:23:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 10 02:23:13 2017 +0000
tree 025ffdd0ee5fc77f0c9a2de21f9d3d3146b224dc
parent 4d55997a193827675ff1eee7ffe5d23f3772c985
parent eb13f9e6a31020ad15f4c5fffba47d492fa957f7

Merge "Fix sanitizer in SurfaceFlinger BufferLayer."

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index b94d3d5..201b5a3 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1184,9 +1184,6 @@
 
     RunCommand("SYSTEM PROPERTIES", {"getprop"});
 
-    RunCommand("VOLD DUMP", {"vdc", "dump"});
-    RunCommand("SECURE CONTAINERS", {"vdc", "asec", "list"});
-
     RunCommand("STORAGED IO INFO", {"storaged", "-u", "-p"});
 
     RunCommand("FILESYSTEMS & FREE SPACE", {"df"});

services/sensorservice/tests/Android.mk

diff --git a/services/sensorservice/tests/Android.mk b/services/sensorservice/tests/Android.mk
index e894655..8a9c36b 100644
--- a/services/sensorservice/tests/Android.mk
+++ b/services/sensorservice/tests/Android.mk
@@ -4,6 +4,8 @@
 LOCAL_SRC_FILES:= \
 	sensorservicetest.cpp
 
+LOCAL_CFLAGS := -Wall -Werror
+
 LOCAL_SHARED_LIBRARIES := \
 	libutils libsensor libandroid