diff options
| author | Maurice Lam <yukl@google.com> | 2017-01-12 21:35:10 -0800 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-02-24 17:43:26 -0800 |
| commit | 109dfaf56e76ff89d24854a03933a58714547aca (patch) | |
| tree | 0b4f73f1b3d517617d7b9a8adaf7a347d0307487 | |
| parent | 4538a5b6bdd23170b37ea035e8abd7374be7a89f (diff) | |
| download | EmergencyInfo-nougat-mr2.1-release.tar.gz | |
Mark getFragments as @VisibleForTestingandroid-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-release
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)
| -rw-r--r-- | src/com/android/emergency/EmergencyTabActivity.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/emergency/EmergencyTabActivity.java b/src/com/android/emergency/EmergencyTabActivity.java index 8ce2e2ce..5f143437 100644 --- a/src/com/android/emergency/EmergencyTabActivity.java +++ b/src/com/android/emergency/EmergencyTabActivity.java @@ -116,6 +116,7 @@ public abstract class EmergencyTabActivity extends Activity { } /** Return the fragments. */ + @VisibleForTesting public ArrayList<Pair<String, Fragment>> getFragments() { return mFragments; } |