commit 3f54d497235aebd98d5b8e8e0e52da92f838d657
author Hall Liu <hallliu@google.com> Tue Sep 06 17:12:46 2016 -0700
committer Hall Liu <hallliu@google.com> Tue Sep 06 17:12:46 2016 -0700
tree a365aeec6ed0e43c26e19794be3188f2020a81a6
parent 4d9054582d9fd87503833fbc2375bc2f6eaffa9c

Fix more broken tests

Fix Analytics null pointer issue that was introduced by the
InCallService analytics change.

Mark flaky tests from CallLogManager so that they don't get run in
presubmit

Bug: 31041734
Change-Id: I974eaffaa938e37cf183bb551756b7bd2a9e7af1

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 1065ad1..8a8113b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -21,7 +21,8 @@
         android-ex-camera2 \
         android-support-v4 \
         guava \
-        mockito-target
+        mockito-target \
+        platform-test-annotations
 
 LOCAL_SRC_FILES := \
         $(call all-java-files-under, src) \