commit 109dfaf56e76ff89d24854a03933a58714547aca
author Maurice Lam <yukl@google.com> Thu Jan 12 21:35:10 2017 -0800
committer gitbuildkicker <android-build@google.com> Fri Feb 24 17:43:26 2017 -0800
tree 0b4f73f1b3d517617d7b9a8adaf7a347d0307487
parent 4538a5b6bdd23170b37ea035e8abd7374be7a89f

Mark getFragments as @VisibleForTesting

Proguard was stripping out the method, and that somehow causes the
test to be stuck at Instrumentation.startActivitySync(), causing
lab devices to be stuck at this test for some 5 minutes.

Test: adb shell am instrument -w -e class \
      com.android.emergency.edit.EditInfoActivityTest \
      com.android.emergency.tests
Bug: 35674347
Change-Id: I5fb6392b6db58c8a52c1b15fe334428fd0b676e4
(cherry picked from commit e18de7871b4e8fba1fe65c011613dc4abac11079)
(cherry picked from commit 104c84eb89d4e989504d29ac360fa1f241f53493)

src/com/android/emergency/EmergencyTabActivity.java

diff --git a/src/com/android/emergency/EmergencyTabActivity.java b/src/com/android/emergency/EmergencyTabActivity.java
index 8ce2e2c..5f14343 100644
--- a/src/com/android/emergency/EmergencyTabActivity.java
+++ b/src/com/android/emergency/EmergencyTabActivity.java
@@ -116,6 +116,7 @@
     }
 
     /** Return the fragments. */
+    @VisibleForTesting
     public ArrayList<Pair<String, Fragment>> getFragments() {
         return mFragments;
     }