Fixed failed unit tests
authorJack Yu <jackyu@google.com>
Tue, 16 May 2017 23:06:34 +0000 (16:06 -0700)
committerJack Yu <jackyu@google.com>
Thu, 18 May 2017 22:25:22 +0000 (22:25 +0000)
commitd39e96c42430661190208747b02f48953cdb58c4
tree3797e8422fcabdc8344d49be12931b366c13caa7
parente5dfa472a3c4d982aba94403bb878cf3705d5f4a
Fixed failed unit tests

1. Fixed a failed/flaky signal strength unit test caused
   by ag/2247950
2. Gracefully reset airplane mode settings in testCarrierActionResetOnAPM

Test: Telephony unit tests
bug: 29579544
Merged-In: I1108e62d1b970c5ac267173ea61afab9b78a624b
Change-Id: I1108e62d1b970c5ac267173ea61afab9b78a624b
(cherry picked from commit 53ea3cba6d262848046740915d8c6a1a56ee5a89)
tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java
tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java