• Home
  • History
  • Annotate
  • only in /frameworks/opt/telephony/tests/telephonytests/src/
History log of /frameworks/opt/telephony/tests/telephonytests/src/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ebbb6b76ebb0afd9e66f5927f431a93f0f0b85b7 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> Get current calls on phone type switch.

There may be active calls from previous phone type.

Bug: 29738766
Change-Id: I16a57567fd72be35a7e15eccb6a65f540b51874d
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
5c90e11a655cfde1e7eeb047f05ce66ccb5828bc 22-Jun-2016 Y <fionaxu@google.com> add upper bound on nitz year

-framework will ignore NITZ time after Jan 1, 2038 to avoid malicious
basestation hack phone time and cause phone crashes
-unit test

Bug: 29083635
Change-Id: I4f60610ed13f5d6e7b0cf18f43708be2e528368c
om/android/internal/telephony/ServiceStateTrackerTest.java
7d9297a8415f4515508c0bf9abbd650e5ce6aa1b 03-Jun-2016 Amit Mahajan <amitmahajan@google.com> Revert to sticky broadcast for SIM_STATE_CHANGED.

Should be changed only when an API is added that allows query for
LOADED state, otherwise this causes issues for some OEM apps.

Bug: 29061608
Change-Id: I52b2139cb1807f8c39329a08762fb98e24a75adb
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
49f8d972bfda9f09af89175f4860762b5dee70f2 27-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix failing unit test." into nyc-dev
578df6250b7ca57ba044753b4bc62ad002cd8d40 26-May-2016 Amit Mahajan <amitmahajan@google.com> Fix failing unit test.

Bug: 28883656
Change-Id: Ia6e1ca8450f8ae9fb5c162bd62f581af8f2b7e5e
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
f6d865fd88a8326126e2b3f836b94cfebba3a5a7 25-May-2016 Derek Tan <derektan@google.com> Use getConfigForSubId instead of getConfig(int).

Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: Ib55064226da5371d5acf014c0e0c20f3724d02c4
om/android/internal/telephony/ContextFixture.java
4ac3b86a52c65cdbc63a20893969cd5063ec0c21 25-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not register broadcastReceiver for all users." into nyc-dev
9b813aa455186511edd03bb738334a1acca7e7b3 24-May-2016 Amit Mahajan <amitmahajan@google.com> Do not register broadcastReceiver for all users.

Registering for all users makes it receive the intent for each
user which is not required.

Bug: 28933982
Change-Id: I797d4d3d4553658a7e4e5021f45dfef5bb6ff05c
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
d6ef8b268789f1202416149254ca16e33e27d74b 23-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add null check to avoid exception." into nyc-dev
058f54014bdd6bc9585d39bb9872b7614c8bb63e 21-May-2016 Amit Mahajan <amitmahajan@google.com> Add null check to avoid exception.

Code was already added for b/28614514; moving it to check a little
earlier. Also adding another null pointer check.

This takes care of b/28842442 too.

Bug: 28883656
Change-Id: Ib8e29a7cc18bffa45a361c27a640fef791d6cafa
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
716f4e1a5cac924603c59661ef2eb90f4d34d0d8 20-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to not use getFullIccId in SubscriptionInfo." into nyc-dev
e8acb3d6f6f9d1d9a3d7d1c002cac45a5f6a39e2 20-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix unit test for multi-part SMS." into nyc-dev
673a8e3d057090abebfc614349af500ef0b63b46 19-May-2016 Amit Mahajan <amitmahajan@google.com> Fix unit test for multi-part SMS.

Bug: 28821195
Change-Id: Idde4b7ef6f2cee999cccd3ee795d21f1e68edc37
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
41a58e19c420cf2301aceed5f02813d1e5646f11 19-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-dev
a83613955a113b805729cd415aca50707529208a 18-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to scan raw table right away if user is already unlocked.

Bug: 28821195
Change-Id: I79d7bcccbaa2e0bb4841c70b7188cff151b701f7
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
2416ed9dea025ad22c37d333ac1cbf4fae75c3ab 17-May-2016 Amit Mahajan <amitmahajan@google.com> Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED.

There may be apps that rely on SIM_STATE_CHANGED but may not receive
the intent if they are not direct-boot aware. This change is to
rebroadcast the last SIM_STATE_CHANGED intents for each phone
after user unlock.

Bug: 28763595
Change-Id: Ib81e73a946d731987576357ec7c2da19fa310341
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
525130aaed5ad8bfa22f64353d298b927b7ed3d0 17-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to not use getFullIccId in SubscriptionInfo.

getFullIccId includes hex chars in the ICCID, making it appear
as if its a new ICCID and thus SubscriptionInfo generates new subId
even for SIMs already known to the device (on first upgrading to N).

Bug: 28773363
Change-Id: I4d262d69c3042bef9e711935e02942ec3667171f
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
af891393ac9e6bd19bef8f5b5b01804d06e268fd 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev
7f14ab6328559e4456d969b735ab8f383a05d0e5 06-May-2016 Amit Mahajan <amitmahajan@google.com> Add check for empty operatorNumeric to avoid crash.

Bug: 28600710
Change-Id: I7816457abbe2431c543274715f33220ff9f0cb29
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
5452ccfc4d32fab9933bdcfe775c38f73d4e1b15 05-May-2016 Robert Greenwalt <rgreenwalt@google.com> Base APN State on the state of the ApnContext.

Stop using enablement or activeness as a proxy for state and
just ask for the state. Enablement has changed (since L)
to indicate if we should look for a connection and is not
representative of if we have a connection.

bug:26785653
Change-Id: I8c1edda733509d2539989e727809c13002abf37f
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/mocks/DcTrackerMock.java
6e79d7d52d9ddb79b7e9a15a2be4797e9a5af25f 04-May-2016 Robin Lee <rgl@google.com> Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
b1759bbf1d382177c4103e70b690f1d26460b0d7 26-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Telephony metrics: Avoid sending same data on ServiceState changes

Bug: 27856524
Change-Id: Ifc257559f4ffddba42f483c26f282645910a0dee
om/android/internal/telephony/TelephonyEventLogTest.java
92867f07cf5873b840256c52dc9c2ab5d3455416 03-May-2016 Robin Lee <rgl@google.com> Add lockdownEnabled parameter to always-on VPN API

Allows callers to opt-out of blockading network traffic during boot and
on VPN app failure.

Bug: 26694104
Change-Id: I01572241eec5b21501b79a030ccd1c3aff0f21d9
om/android/internal/telephony/mocks/ConnectivityServiceMock.java
8ca2e656bd1143d671e893191b08ff93a4bd2692 28-Apr-2016 Jeff Sharkey <jsharkey@android.com> Follow framework refactoring.

Bug: 26571724
Change-Id: Ie88f0099f365e65eb025d8c6fc516b9580390c2f
om/android/internal/telephony/mocks/ConnectivityServiceMock.java
3d8c0f70a6fa7a53fda3c5d592de0ac3aa247e3c 21-Apr-2016 fionaxu <fionaxu@google.com> Info zero-rating for roaming based on carrier cfg

ignore non-metered roaming apn types when cleanup or setUpDatacall.

Bug: 26317905
Change-Id: Iae9a798c43fde020ba215b7a59e83e41559a97c9
om/android/internal/telephony/dataconnection/ApnSettingTest.java
om/android/internal/telephony/dataconnection/DcTrackerTest.java
edebaf37a58e4ebee4b70c674d42cb458caec171 23-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use getFullIccId() in SubscriptionInfoUpdater." into nyc-dev
0979b71e48405cab10bdf1d1b4170cfce72838a7 21-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data call setup failed after default data SIM switches

Need to reset the auto attach flag when DDS occurs.

bug: 28181225
Change-Id: Ib4405b94ac3085e48cb029451cc44f4eee6408c2
om/android/internal/telephony/SubscriptionControllerTest.java
om/android/internal/telephony/dataconnection/DcTrackerTest.java
862286222955ea0b67764b0fcae5eeb65000d6fa 21-Apr-2016 Amit Mahajan <amitmahajan@google.com> Use getFullIccId() in SubscriptionInfoUpdater.

It already uses bchToString() to parse ICCID. It should also use
getFullIccId() when querying ICCID directly from IccRecords.

Bug: 25410213
Change-Id: I26fe470810821b7bd9cdd014ba4e1b8c63464a48
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
5b6fe731da866f19f0c06795a67fdfdc7023b3c5 20-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Fix unit test regression" into nyc-dev
fe809fa371e9eab6d3b89fd2dad38c5f1479e6fe 19-Apr-2016 fionaxu <fionaxu@google.com> Fix unit test regression

SubscriptionController and DcTracker

Bug: 27788524
Bug: 27787361
Bug: 25203607
Change-Id: I1f3281f509d9759034df4d9e7b3d03aa7f9b00de
om/android/internal/telephony/SubscriptionControllerTest.java
om/android/internal/telephony/dataconnection/DcTrackerTest.java
aa4b4df0d128b8705c38c5f54dde798721f4cc56 20-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Cold Sim fix for DataConnection and DCT" into nyc-dev
f889d7da70408c4724623965ee877f065222faf0 19-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Delete PhoneBase and PhoneProxy." into nyc-dev
a02b6fd88953d783c32e6d7f84b7eddbc0d1faf1 08-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim fix for DataConnection and DCT

Bug: 25203607
Change-Id: I3bbef77edf57eaa8d7da24d687cc9b5ab0ef111b
om/android/internal/telephony/SubscriptionInfoTest.java
0884e25cecf4145dfe72059802ac16e0c859e94a 19-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Tidy up uses of Integer.valueOf." into nyc-dev
fc240dcd9b7f40b78913f18663809d683c6dbe65 19-Apr-2016 Narayan Kamath <narayan@google.com> Tidy up uses of Integer.valueOf.

Use parseInt when the result is assigned to an int. Allocates fewer
objects.

bug: 28078871
Change-Id: I8219141b8a18d2bc575fd75aaa4552e15bd68d1f
om/android/internal/telephony/SmsNumberUtilsTest.java
0f7d1220e8584c7f227e6c6c0be0e26d1c6b7de1 15-Apr-2016 Amit Mahajan <amitmahajan@google.com> Delete PhoneBase and PhoneProxy.

Bug: 26544841
Change-Id: If95584d81f28829faf7bd91f88af2c0a60aad69f
om/android/internal/telephony/mocks/SubscriptionControllerMock.java
2707808f0b185b05d536d6c2e593d4950d575817 18-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
500c6ff35876773ddc5750d737542e0a435c0118 15-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Infer Zero Rating based on NetworkCapabilities" into nyc-dev
783061ca03572618c01ce244d70d82fa4328d45f 01-Apr-2016 fionaxu <fionaxu@google.com> Infer Zero Rating based on NetworkCapabilities

when user toggle Disabled Cellular Data, we teared down all
DataConnections which are Metered(every APN type in the APN settings
are non-metered otherwise metered).

bug: 27788524
Change-Id: I0228e6ca166516f4f43e1c15d505fc29c31356df
om/android/internal/telephony/dataconnection/DcTrackerTest.java
b7a9a233cd69bf5f059092350b761302de3de6cd 15-Apr-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data retry didn't happen issue" into nyc-dev
9e51994d8ccf00bf56f54d5875e77732c4558480 14-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Switch TelephonyEventLog from using ITelephonyDebug to ConnectivityMetricsLogger" into nyc-dev
e8165ef37ea1448cf60a965c3f131e65c6044b10 14-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Update unit test for InboundSmsTracker to handle new column in db." into nyc-dev
0852a954be5937a1b0bca94df0c2007d7ee3c0c7 13-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data retry didn't happen issue

When modem return -1 as the retry value in setup data call response,
we should interpret it correctly and retry the data connection.

bug: 27787361
Change-Id: I0a3e442f5125730dd9a196ce632120b44b880090
om/android/internal/telephony/dataconnection/DataConnectionTest.java
om/android/internal/telephony/dataconnection/DcTrackerTest.java
om/android/internal/telephony/dataconnection/RetryManagerTest.java
5e8c2fdd13130e38494b725c5f4bfc582bc55361 14-Apr-2016 Amit Mahajan <amitmahajan@google.com> Update unit test for InboundSmsTracker to handle new column in db.

Bug: 27974596
Change-Id: I13436a4715855ddd11ba35d7a087e1779ad36ce8
om/android/internal/telephony/InboundSmsTrackerTest.java
afcf73091e9634596770ff925ba928481247a8ba 13-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to de-dup messages in SMS raw table." into nyc-dev
6e4abd849e12860a7459f7ec74496ca02b9d7ee0 28-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to de-dup messages in SMS raw table.

Bug: 27820591
Change-Id: Ie3a28cdbbb533c74f456b7e942ddfc2cd0d66bb0
om/android/internal/telephony/InboundSmsTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
bd3158360ca73324921350a1c61336af7f9c6d8d 13-Apr-2016 Shishir Agrawal <shishir@google.com> Adding slotId to certain Telephony broadcasts.

These particular boradcasts need to expose phoneId since they are valid even
when there is no SIM.

ACTION_SERVICE_STATE_CHANGED
- Added phoneId to broadcast.
- Removed TelephonyRegistry non subId call.
ACTION_SIGNAL_STRENGTH_CHANGED
- Added phoneId to broadcast.
- Removed TelephonyRegistry non subId call.
ACTION_PHONE_STATE_CHANGED
- Added phoneId to broadcast.
- The non-subId version is called by Telecomm to communicate overall state.
Telephony sends its own version, so only the Telephony call needs to add
phoneId.

Bug: 27378995
Change-Id: Ib24ea6accc265170c5d3938e2cb2c518edfcf8a8
om/android/internal/telephony/DefaultPhoneNotifierTest.java
om/android/internal/telephony/mocks/TelephonyRegistryMock.java
f83b2ff83d82e570a3a3011df7b566c477d687cd 13-Apr-2016 Jack Yu <jackyu@google.com> Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
2dd874066ed871c8adf50f58e4b025d525db78eb 09-Apr-2016 Jack Yu <jackyu@google.com> Moved ERI configuration files from resoures to Carrier Config.

Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.

bug: 23887558
Change-Id: Ibe2ff7862bf50e31b52fb783c49bda993f8d2ca7
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
0579827c22bd005a989fed714c541d734e83a28a 13-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Note when we don't know a default phoneId" into nyc-dev
b0e90cc628ade0c1fc89f2bd8ce40e21ab111a7d 13-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix voicemail number related unit test." into nyc-dev
0cf8dcd827da174a7d7f366aa8caa5dd29206ea1 13-Apr-2016 Amit Mahajan <amitmahajan@google.com> Fix voicemail number related unit test.

Bug: 26032015
Change-Id: I3fc9343f05f142c2916fd16572950962d3f3e325
om/android/internal/telephony/GsmCdmaPhoneTest.java
6899928dded685d401dcd010132fb9fc30ce3745 12-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Note when we don't know a default phoneId

Otherwise we don't notice the new default on sim swap.
On a single-sim device the default phoneId will be
the same again but if we don't notice it's loss
we won't notice its gain. The pattern:
initial condition
phone[0] subId 1
default subId 1

sim removal
subId changes 1 -> -2 (invalid)
this causes both subId notification and default notification
prior to this change this did both, but left the SubMonitor
thinking the default phoneId was still 0. After this CL
it changes that to INVALID

sim insert
subId changes -2 -> 2
this causes a subId change notification
default changes 1 -> 2
this should cause a default notification, but before this CL
we though the default phoneId was 0 and now it's again 0, so
no notification. With this CL it'll be a INVALID -> 0 change
and the notification will go out

bug:27425942
Change-Id: I2875a223fbf298d23037875302e25816fe19a52e
om/android/internal/telephony/SubscriptionMonitorTest.java
d4e4c8b591e7dc4a21d1b9cabac1b25b23ddbe56 12-Apr-2016 Jack Yu <jackyu@google.com> Merge "Fixed unit test cases" into nyc-dev
8cdef4cbdcfe8d159b905647605b135c950ec20d 11-Apr-2016 Jeff Davidson <jpd@google.com> Merge changes from topic 'carrier-app-race' into nyc-dev

* changes:
Test disabling carrier apps with null TelephonyManager.
Move CarrierAppUtils to frameworks/base/telephony.
0c0816c7f247e9d816ad178a22dac2c9b45e908e 11-Apr-2016 Jack Yu <jackyu@google.com> Fixed unit test cases

Made the test cases more sim independent.

bug: 25691379
Change-Id: I84c5d3e2ee3afc2339a585324caedad889e430a3
om/android/internal/telephony/PhoneNumberUtilsTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
45955dc98ef7c5a02508bb0be5cbc0130a94ba1d 09-Apr-2016 Jack Yu <jackyu@google.com> Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
7a1c1b02c8603c2bf2f3b401facb389528180eed 08-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Switch TelephonyEventLog from using ITelephonyDebug to ConnectivityMetricsLogger

Bug: 28026463
Change-Id: I3c4f14e8a6611f0cb5c52eb24573621d3a13c4cb
om/android/internal/telephony/TelephonyEventLogTest.java
om/android/internal/telephony/TelephonyTest.java
b548a8c87b4dd20f4a2f41fc339a0d41c3612bc3 07-Apr-2016 Jeff Davidson <jpd@google.com> Test disabling carrier apps with null TelephonyManager.

Bug: 27821069
Change-Id: Icd4e35dae7a684674ffe9e8e270ebedcfc4c02c4
om/android/internal/telephony/CarrierAppUtilsTest.java
072f14af78f660b29873c27cbe5bb757cc26cd75 07-Apr-2016 Robin Lee <rgl@google.com> Merge "Track ConnectivityService hidden API in mock" into nyc-dev
8b0a1cbd24977a1abbba79736cf9f481ced0703a 30-Mar-2016 Jack Yu <jackyu@google.com> Excluded certain APNs (e.g. IMS) from mobile data usage.

Added not_metered capability to a mobile network if none
of its associated APN types are metered. Also used not_metered
capability to determine if a network should be accounted for
data usage or not instead of using network type, which is
always MOBILE after refactoring. Will add VT usage support
in next phase.

bug: 20888836
Change-Id: Ic39c9ffc84e27566a5b10ebf9aaa4ee3d6bd3e49
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/dataconnection/ApnSettingTest.java
afedf1be1d426c00510511c19872ae2750f2497f 04-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Fix SubscriptionControllerTest failure" into nyc-dev
18c35e9b2beea918e6cea687514fc8af4ea6a759 04-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Changes to de-dup messages in SMS raw table."" into nyc-dev
0acde342e973a838a46eebf57a03a5fcad12708e 04-Apr-2016 Amit Mahajan <amitmahajan@google.com> Revert "Changes to de-dup messages in SMS raw table."

This reverts commit 8fe2baabaae75ab2975fb642db9a91db75d1a11e.

Bug: 27974596
Change-Id: Id5284e9f3da34b028e0097dc8f0e43a98e3a7a86
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
a03e5552830cfb4214095fd473243bb3f12284ae 04-Apr-2016 fionaxu <fionaxu@google.com> Fix SubscriptionControllerTest failure

Clear Settings for the default Sub
Bug: 25691379

Change-Id: I62789088f0c5019e9c1ff1340a6c83a82c11fe4e
om/android/internal/telephony/SubscriptionControllerTest.java
a119e8e5c2df6905f7e873359a52639364a61663 01-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add implementation for mock Settings content provider." into nyc-dev
fe51ed106cd3ec081bac54ded1bfb314d14fa926 01-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Set isGsm flag in SignalStrength correctly." into nyc-dev
0b24cf9fa32362616f3c55da9c0ec768c4bd174b 31-Mar-2016 Amit Mahajan <amitmahajan@google.com> Set isGsm flag in SignalStrength correctly.

Bug: 27541623
Change-Id: Id399f67e0d1a73e9485b71a5907e716a79297b2b
om/android/internal/telephony/ServiceStateTrackerTest.java
cdc32166d4bc51399c1a4133220fe7db6883d60e 31-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix ServiceStateTracker unit tests." into nyc-dev
fd6ce6219b41f9735240b9d0665d27c32482abd1 31-Mar-2016 Amit Mahajan <amitmahajan@google.com> Add implementation for mock Settings content provider.

Bug: 25691379
Change-Id: I2dd74c529f489613cca4b8b04cbb445cee8c902e
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
3e17ed857f92e8e4bce2c7f72c160285963bbb45 31-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Fix ServiceStateTracker unit tests.

Bug: 25691379
Change-Id: I427ffcec4761114c2e333726351544970026c74d
om/android/internal/telephony/ServiceStateTrackerTest.java
9fff811825dcc1f44b67e735733547fc44069f3a 30-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to de-dup messages in SMS raw table." into nyc-dev
f9a7f1f9eb901ee109a6ee5e9cd885e09c6cb478 30-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Unit tests for ServiceStateTracker" into nyc-dev
8fe2baabaae75ab2975fb642db9a91db75d1a11e 28-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to de-dup messages in SMS raw table.

Bug: 27820591
Change-Id: I6b071ec99a90d9f5195825ba3cd73cb54f61631b
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
f32222bd7bf1e3e619b1451b46f7f4aa94474ba1 29-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Unit tests for ServiceStateTracker

+ Adding unit tests testing public functions in ServiceStateTracker

Bug: 25691379
Change-Id: If99e7df70f1168124b361cc5e406a01021024136
om/android/internal/telephony/ServiceStateTrackerTest.java
511b719a26518314300725337f84bdd511e224f2 24-Mar-2016 Robin Lee <rgl@google.com> Track ConnectivityService hidden API in mock

Bug: 27074270
Change-Id: Ifd94e9a2060f540044dfda67931635eff5899f6b
om/android/internal/telephony/mocks/ConnectivityServiceMock.java
4dc97ce8bbead338e6fd2adc3c5e1e51af171f3b 23-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First Unit Test for PhoneStateListener" into nyc-dev
d58f5ac4f8d9c0ef35ea16849fad21c2d3c638b6 23-Mar-2016 fionaxu <fionaxu@google.com> First Unit Test for PhoneStateListener

Bug: 25691379
Change-Id: Iab36049a769bfe557a394d4cb9aa87152b3a69a5
om/android/internal/telephony/DefaultPhoneNotifierTest.java
om/android/internal/telephony/PhoneStateListenerTest.java
om/android/internal/telephony/mocks/TelephonyRegistryMock.java
ffb90b77322fa64adbe79b976f1c16f3c9441753 19-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to release wakelock on ECM exit in ImsPhone.

Includes ImsPhone ECBM unit test.

Bug: 27378459
Change-Id: I71da054e303d0a88ee79b6429fc3a154121efe46
om/android/internal/telephony/imsphone/ImsPhoneTest.java
bdad20f094ba3aab0013278ef65123c57a4ae900 22-Mar-2016 Chen Xu <fionaxu@google.com> Merge "More Unit Tests on CallManager" into nyc-dev
55ff0eb7c2f9910c13f03f63514198b95e382973 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to handle RUIM_RECORDS_LOADED only if phone type is CDMA" into nyc-dev
9383ca3f4c1522129927e1c7196f00de3900a3b9 22-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Refine pollState when the modem is off." into nyc-dev
4f81d75a7961f20a9255d85d2f7b2ed366fae117 21-Mar-2016 fionaxu <fionaxu@google.com> More Unit Tests on CallManager

Bug: 25691379
Change-Id: Iccb59e624681358e219e3d8e1ecc3d5a78c94b25
om/android/internal/telephony/CallManagerTest.java
dbe4d7749d5524be575f629486874acdae721138 19-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to handle RUIM_RECORDS_LOADED only if phone type is CDMA

Same for EVENT_POLL_STATE_CDMA_SUBSCRIPTION, and similarly
EVENT_RESTRICTED_STATE_CHANGED only on GSM.
CL also includes change to update icc related info after RAT
specific initializations are done (on phone type switch).

Bug: 27746848
Change-Id: Ia25e1219ab473b6542ffc40d27dae1719b370660
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
b9e8a7d21c671240b387bb6b8e8314aa710c0d57 18-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Refine pollState when the modem is off.

It had been fixed to not ask the RIL for state if the modem was off
unless we're on IWLAN. However, the first indication we're on
IWLAN comes via a pollState response. Modified to also poll
if the pollState trigger came from the RIL (ie, a network state change
notification).

bug:27486486
Change-Id: Ibaed6e2e98d27e651faeeccf71d43e7ff77c938b
om/android/internal/telephony/ServiceStateTrackerTest.java
7ad25414ae9b67dc1dec116e3867c44689861dd9 18-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsBroadcastUndelivered." into nyc-dev
871a2ec0bc8e8198aeb1913e7bf6cb22a7ff3604 18-Mar-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for SmsBroadcastUndelivered.

The behavior that needs to be verified is strongly tied to
InboundSmsHandler so adding the tests in GsmInboundSmsHandlerTest.

Bug: 25691379
Change-Id: Icf62bf50c417964bb3a27587ec03452ea34c1cbd
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
4698f5cc8dcf0f31a03c64f90e5faa1b4ffed5fc 17-Mar-2016 Jack Yu <jackyu@google.com> Fixed that bad address returned from network crashes the phone.

Added bad address handler to prevent the crash.

bug: 26920352
Change-Id: I58734b0fc08507ec18170a888b26347870214c66
om/android/internal/telephony/dataconnection/DataCallResponseTest.java
6dea04ab6f8e9ac605b292778a98d25226a9355a 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Some more unit tests for ImsPhone." into nyc-dev
cc8ea4abbe4f1f755dc5cf1b576d51ceb24fe79d 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Some more unit tests for ImsPhone.

Bug: 25691379
Change-Id: Iafbe34b0b7edc8a53c0607b46f5abf8618f3768a
om/android/internal/telephony/imsphone/ImsPhoneTest.java
1d70c5957152ac4c8541f530e42ce596ca3f11d5 17-Mar-2016 Jack Yu <jackyu@google.com> Fixed the broken DcTrackerTest.

Fixed the regression and added more checks.

bug: 25691379
Change-Id: Idb614b5fcb1308a9d3af1feff61f267f4d7754df
om/android/internal/telephony/dataconnection/DcTrackerTest.java
9f5345c094210aa5d6606b7705a85a7bc17e831d 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Fix for failing ImsPhone unit test.

Bug: 25691379
Change-Id: I035cc0fb5c5ce17bfc111e1faf6ff41fd80b701f
om/android/internal/telephony/imsphone/ImsPhoneTest.java
af59a35e945d60fc9ffb305c494a695b35b8a942 16-Mar-2016 fionaxu <fionaxu@google.com> TelephonyManager unit test cleanup

Bug: 25691379
Change-Id: I129c8b4f04ad7e6d777857e8c7853de7a86348cc
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/PhoneSubInfoControllerTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/SmsNumberUtilsTest.java
om/android/internal/telephony/SubscriptionControllerTest.java
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/VoLteServiceStateTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/uicc/UiccControllerTest.java
9ee5b72d4db35672789fd47afe6e18ead8cdea1b 16-Mar-2016 Chen Xu <fionaxu@google.com> Merge "More Unit Tests on DefaultPhoneNotifierTest" into nyc-dev
ec2ebbaecd22cfb661fb1bf70dafe953a0d595ff 16-Mar-2016 Jack Yu <jackyu@google.com> Merge "Fixed that setup wizard sometimes report en-GB as default language." into nyc-dev
efe268c9e4dea78a03170684fa11d0f7e9e54cd0 16-Mar-2016 fionaxu <fionaxu@google.com> More Unit Tests on DefaultPhoneNotifierTest

Bug: 25691379
Change-Id: Idb0c5f0763cbc8f4c8be9789bf9c71c242b2c972
om/android/internal/telephony/DefaultPhoneNotifierTest.java
f3a8202e74cb4de79626e143acde42f1f4ff3fd9 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Id438132b,I9d0c6c45 into nyc-dev

* changes:
Better fix for intermittently failing tests for InboundSmsHandler.
More ImsPhone unit tests.
1573c17cbeab5a41936d369cb05cb7c0b0299ca1 14-Mar-2016 Jack Yu <jackyu@google.com> Fixed that setup wizard sometimes report en-GB as default language.

The incorrect language was caused by the incorrect MCC/MNC reported
by CSIM application. Fixed by retrieving the correct MCC/MNC from the
telephony manager public API, which internall pulls out the correct
MCC/MNC from the USIM application.

bug: 26963170
Change-Id: I7a2f9fc7761364f52c2caa1668d4086ede9d210d
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
db0b156c2a1bd84d3076af9990042524c8c600c9 15-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First Unit test for DefaultPhoneNotifier" into nyc-dev
cfcdffe371d0e69631034beefc2b0995540c1824 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> Better fix for intermittently failing tests for InboundSmsHandler.

Bug: 25691379
Change-Id: Id438132bfc979a2fa53d7eb05c99bfbe66095671
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
ec6e2f9f13bac23cdfa0de0a56826b21050b6487 14-Mar-2016 fionaxu <fionaxu@google.com> First Unit test for DefaultPhoneNotifier

bug: 25691379
Change-Id: I3e2c6c94fec10f3f4ec37cb4b06e837c9bbf28b7
om/android/internal/telephony/DefaultPhoneNotifierTest.java
om/android/internal/telephony/PhoneSubInfoControllerTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/WapPushOverSmsTest.java
om/android/internal/telephony/dataconnection/DcTrackerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
93c62c8a71821f46194e16ca3e84f95e101edb90 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> More ImsPhone unit tests.

Bug: 25691379
Change-Id: I9d0c6c45def7cf60228ea86412cf38d55068a6ff
om/android/internal/telephony/imsphone/ImsPhoneTest.java
0d25406d3f2dcef4d78355ef52af3b4d441fbf0d 14-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "More unit tests for ImsPhone." into nyc-dev
0c43665543f9a221fed5960d728175210847fc26 14-Mar-2016 Chen Xu <fionaxu@google.com> Merge "Add tests for CdmaSmsDispatcher with code cleanup" into nyc-dev
7dc57a87610b8f203605639338c5aca12886ec53 12-Mar-2016 Amit Mahajan <amitmahajan@google.com> More unit tests for ImsPhone.

Bug: 25691379
Change-Id: I32e96837df872eec6671b46f5e5d1b2b4a3bc665
om/android/internal/telephony/imsphone/ImsPhoneTest.java
6ba18ef5f3733709f16ef03b3d2b2de076b63c3e 11-Mar-2016 fionaxu <fionaxu@google.com> Add tests for CdmaSmsDispatcher with code cleanup

bug: 2569137
Change-Id: I4a116b753b2fe79e64786293e5c9c1cf6e04b430
om/android/internal/telephony/ImsSMSDispatcherTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
b15af5a82377b8ad6d46b5f93186510b56b4a449 12-Mar-2016 fionaxu <fionaxu@google.com> Add Unit Test for ImsPhoneFactory

bug: 25691379
Change-Id: I22d628cce12dbed1afac35641983b800e47fbd17
om/android/internal/telephony/imsphone/ImsPhoneFactoryTest.java
95ec763edbf8bb5b8484c1460897c0ba279b03a3 11-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First ImsSMSDispatcher Unit Test" into nyc-dev
f06b7cffd2240725be159097be048fc1d3a7653c 10-Mar-2016 fionaxu <fionaxu@google.com> First ImsSMSDispatcher Unit Test

bug: 2569137
Change-Id: Ibc64fb14459b062e05968212774612f7c2b2dbc0
om/android/internal/telephony/ImsSMSDispatcherTest.java
b40308275e70d445c62fd9da062443dbbc53e513 10-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for DataConnection" into nyc-dev
4b2613ad8d9825c892a03558a227c2cee71473d7 07-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for DataProfile

bug: 25691379
Change-Id: I56f60c410244707af8db3b7606b0a891009dfbf4
om/android/internal/telephony/dataconnection/DataProfileTest.java
e3f497323441d0c9215f6cbad9ce950f054cce72 09-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for DataConnection

bug: 25691077
Change-Id: I90920c7625ec7f8f716fbab15f65c7f4323628cc
om/android/internal/telephony/dataconnection/DataConnectionTest.java
91abb5484d609dd4f117dd3dc234fe9a1b619c91 08-Mar-2016 Jack Yu <jackyu@google.com> Fixed the broken DcTrackerTest

bug: 25691379
Change-Id: I174579ccb26815b29092294a40c63121f685101c
om/android/internal/telephony/dataconnection/DcTrackerTest.java
9b745eec57bcd55e1a33cfe9f20cbd8125286e91 08-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Support for call forwarding status for multi-sim." into nyc-dev
98a99db88463ebcf69de5ca24d8cad26d30e963d 08-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added test cases for DataCallResponse" into nyc-dev
d520d895c1af9974f61235bdf35cf5221abbe98a 05-Mar-2016 Amit Mahajan <amitmahajan@google.com> Support for call forwarding status for multi-sim.

Includes changes for multi-sim voicemail count support and
unit test.

Bug: 18108420
Change-Id: I8d7a4e796491c8d90ad213242ff37747043c72a1
om/android/internal/telephony/GsmCdmaPhoneTest.java
05776d0c8cbc7eefe367062cfa724cdffc37af82 07-Mar-2016 Jack Yu <jackyu@google.com> Adde unit test cases for DcFailcause

bug: 25691379
Change-Id: I4f330bfaf32ccfc1b851f82a8cb5e2b165779942
om/android/internal/telephony/dataconnection/DcFailCauseTest.java
3aec0aa89b62081c25552cd57f89c543d2c48059 07-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for ApnContext" into nyc-dev
f2be4db966d151fe58a132991bfce9d59f8d8c67 07-Mar-2016 Jack Yu <jackyu@google.com> Added test cases for DataCallResponse

bug: 25691379
Change-Id: I4bd0ebf3bd8b27a29bcd98f865d5fa61b716e1fe
om/android/internal/telephony/dataconnection/DataCallResponseTest.java
228be5141913bf0f89fa23cdafdc86e20d6974b1 07-Mar-2016 Chen Xu <fionaxu@google.com> Merge "PhoneSubInfoControllerTest Unit Test" into nyc-dev
9e0be93719c4de0cedec33508c799f3b2f223454 05-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for ApnContext

bug: 25691379
Change-Id: I1a4a10dd6594b8a102ff6af5674ab899bad6f338
om/android/internal/telephony/dataconnection/ApnContextTest.java
18ad8bf07feb9f6a9d187da236f3e56c055e941a 04-Mar-2016 fionaxu <fionaxu@google.com> PhoneSubInfoControllerTest Unit Test

bug: 2569137
Change-Id: I39f8d3ddf16e5b3dcb61a11fc22003a41c81fe2c
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/PhoneSubInfoControllerTest.java
om/android/internal/telephony/TelephonyTest.java
c1128c76f1afc3f01c735eeca951045f701a68ed 07-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Phone-switch cleanup: remove updateParentPhone()." into nyc-dev
d1d673d28b2cf14e21e50868e05d96ff73e951af 05-Mar-2016 Amit Mahajan <amitmahajan@google.com> Phone-switch cleanup: remove updateParentPhone().

This is not needed as the parent phone object never changes with
the phone-switch refactor.

Bug: 25793157
Change-Id: If1cf30bc9f35a23cf7fc1c713517e99cbaa063b1
om/android/internal/telephony/mocks/PhoneMock.java
9a2d68f18b4441404eaa4d1cb45d9b457915b234 03-Mar-2016 fionaxu <fionaxu@google.com> move Uicc TCs to UICC subfoler and code cleanup

bug: 2569137
Change-Id: I0afcbc570fa04326d319788fbaa3217d413144f8
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/IccPhoneBookInterfaceManagerTest.java
om/android/internal/telephony/UiccCardApplicationTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
om/android/internal/telephony/uicc/IccCardStatusTest.java
om/android/internal/telephony/uicc/IccPhoneBookInterfaceManagerTest.java
om/android/internal/telephony/uicc/UiccCardApplicationTest.java
om/android/internal/telephony/uicc/UiccCardTest.java
om/android/internal/telephony/uicc/UiccControllerTest.java
7215585b3e1d0b0745ba999d04a5f4fb082d786b 03-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First Unit test on UiccCardApplication" into nyc-dev
4145d45a5e3076a88e27a3af35c2827a25c413b9 02-Mar-2016 fionaxu <fionaxu@google.com> First Unit test on UiccCardApplication

bug: 25691379

Change-Id: I897a2485ec45285146a122f2717fe7daab334d54
om/android/internal/telephony/UiccCardApplicationTest.java
46428a1d55359d37a65c4e92b0c1983705a1255e 03-Mar-2016 Jack Yu <jackyu@google.com> Merge "Moved data related unit test cases to the sub dir." into nyc-dev
52b742670ebb42f511e518243ef280d663797b38 03-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Remove unused functions from PhoneFactory." into nyc-dev
e8eb48626c3e6ad93c1839b1a9e87030c4b33ce4 03-Mar-2016 Jack Yu <jackyu@google.com> Moved data related unit test cases to the sub dir.

bug: 25691379
Change-Id: I2477dd0a16fbbac8ff79f864f0fd59f86e758b18
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/DcControllerTest.java
om/android/internal/telephony/DcTrackerTest.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/dataconnection/ApnSettingTest.java
om/android/internal/telephony/dataconnection/DcControllerTest.java
om/android/internal/telephony/dataconnection/DcTrackerTest.java
om/android/internal/telephony/dataconnection/RetryManagerTest.java
43bc691fbb0fbb39507458c5d64a8088650255c4 03-Mar-2016 Amit Mahajan <amitmahajan@google.com> Remove unused functions from PhoneFactory.

Also added a simple unit test.

Bug: 25691379
Change-Id: I39b7dbe3914b0821a3f8aa31fe057d54ea5455da
om/android/internal/telephony/PhoneFactoryTest.java
ecac744a4e585e3c7af95ffa06fa3e711131200c 02-Mar-2016 Amit Mahajan <amitmahajan@google.com> First unit test for ImsPhone.

Bug: 25691379
Change-Id: I61a2f0805220782e7dbebaf50604b596ef3ba24b
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/ImsPhoneCallTest.java
om/android/internal/telephony/ImsPhoneCallTrackerTest.java
om/android/internal/telephony/ImsPhoneConnectionTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/imsphone/ImsPhoneCallTest.java
om/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java
om/android/internal/telephony/imsphone/ImsPhoneConnectionTest.java
om/android/internal/telephony/imsphone/ImsPhoneTest.java
3e1a34f254d7e6a5a2cd58a753e1ae2c5900f889 01-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First Unit test for IccPhoneBookInterfManager" into nyc-dev
ce000ddfbb615f873e9fc0a4c68f992b12d3f82f 01-Mar-2016 fionaxu <fionaxu@google.com> First Unit test for IccPhoneBookInterfManager

bug: 25691379
Change-Id: I96ca9db99ec10affa044a7373fb0acfd836a62ae
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/IccPhoneBookInterfaceManagerTest.java
9c3289e51d1097a3123a81cd617e793b3d88c6e7 01-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for VoLteServiceState" into mm-wireless-dev
am: bc9824ac66

* commit 'bc9824ac664bd749f2c453bd297c0c6c11b8ab62':
Added unit test cases for VoLteServiceState
bc9824ac664bd749f2c453bd297c0c6c11b8ab62 01-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for VoLteServiceState" into mm-wireless-dev
8bb3149ff169b01294b9c7afba141b13614c16f7 01-Mar-2016 Jack Yu <jackyu@google.com> Fixed the old broken ApnSetting unit tests.
am: 879ffce9ab

* commit '879ffce9ab0c22c2fc680d6477ec7c3055ebbeec':
Fixed the old broken ApnSetting unit tests.
879ffce9ab0c22c2fc680d6477ec7c3055ebbeec 01-Mar-2016 Jack Yu <jackyu@google.com> Fixed the old broken ApnSetting unit tests.

bug: 25691379
Change-Id: I7315a261ba1a9b80b05edc133d5c2df0897765b9
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/ApnSettingTest.java.broken
4e80126eb068e873f749d33b37072a64cd98510f 01-Mar-2016 Jack Yu <jackyu@google.com> First unit test for DcController
am: 3a5b9323f4

* commit '3a5b9323f422134b68a92c36813001ec8bed2866':
First unit test for DcController
3a5b9323f422134b68a92c36813001ec8bed2866 26-Feb-2016 Jack Yu <jackyu@google.com> First unit test for DcController

bug: 25691379
Change-Id: I11d0a55f8efd1510478bd8dc6965a26118457802
om/android/internal/telephony/DcControllerTest.java
om/android/internal/telephony/DcTrackerTest.java
e415b7b5ae3afec0b7a24d85b930e8cca47499a6 29-Feb-2016 fionaxu <fionaxu@google.com> ImsPhoneCallTracker Unit test for MO Call and DTMF

BUG=25691379

Change-Id: I9225d5a02702b75f48185474abe14e0c2f0901c7
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
om/android/internal/telephony/ImsPhoneCallTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
047f5c37e5ef8259e1c5fe2ca2ec23038d33a441 29-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for ServiceState" into mm-wireless-dev
am: 6f769551f5

* commit '6f769551f54d9bf98975383fd2e7d4195d6cfcee':
Added unit test cases for ServiceState
36c918df3bd4f237142159efa58a1e9b5c2492d1 28-Feb-2016 Jack Yu <jackyu@google.com> Added unit test cases for VoLteServiceState

bug: 25691379
Change-Id: I0a24f5fb9bf338dee58742f9df60f70e7463089e
om/android/internal/telephony/VoLteServiceStateTest.java
168ba9c4a5234e8cccc9d23879aea4c1740d3510 27-Feb-2016 Jack Yu <jackyu@google.com> Added unit test cases for ServiceState

bug: 25691379
Change-Id: I4c722455aa662c27c28dce8a00022d6d564aeca3
om/android/internal/telephony/ServiceStateTest.java
3a24871ae2c6ec822cc4d15688c995c39a6bc822 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of telephony/IccUtils since it has been moved to uicc folder." into nyc-dev
17a3c8b39f73dac470b53934191679899450d97a 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Get rid of telephony/IccUtils since it has been moved to uicc folder.

Bug: 27380348
Change-Id: I5846f092c8825fbdec71b8c46346d3eb8217c3f7
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
om/android/internal/telephony/UiccCardTest.java
6fd2229711f75f686ce6254e6c9859247310598d 26-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Suppress blocks after texting emergency services." into nyc-dev
50a3cae85f7ef6db45a4f6350ea473d7c95dab32 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Increase the time to wait for wakelock to be released." into nyc-dev
6260a3e3cde08cd57335b6325147b0b262fb8efd 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Increase the time to wait for wakelock to be released.

This should help InboundSmsHandler unit tests pass more reliably.

Bug: 25691379
Change-Id: I4046113a3d0781ece774eb829ff55146e72c0ba1
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
4552b1f4f3d7d2f6a19e19cbbc5dcbdacf64cf39 26-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Fix UiccCard Test Failure" into nyc-dev
ed1effde1e208e805b7722d397ea00050306aa38 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for emergency callback mode start/end." into mm-wireless-dev
am: d02f796963

* commit 'd02f796963420fd100a77c8a8cf196b5ce44d2b0':
Unit test for emergency callback mode start/end.
d02f796963420fd100a77c8a8cf196b5ce44d2b0 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for emergency callback mode start/end." into mm-wireless-dev
f21d2289021a94fc74023e2b5987d236df354fe1 26-Feb-2016 fionaxu <fionaxu@google.com> Fix UiccCard Test Failure

BUG=25691379
Change-Id: Ib68920f2369217220282b8338f141b24fb24c334
om/android/internal/telephony/ContextFixture.java
de9c22e95d4e2797076db0c6b798e54f0638b7f0 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for emergency callback mode start/end.

Bug: 25691379
Bug: 27378459
Change-Id: I5c93f6bb6f5e9c9b0da8851c8461c378c18c8c58
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
1bcd7a866ddf8f6f63370c70972f057a4a1ba057 26-Feb-2016 Jack Yu <jackyu@google.com> resolve merge conflicts of 5ba11026cb to nyc-dev

Change-Id: I578f88ca57a85c796c6cc5506617d9627c42d0dd
om/android/internal/telephony/DcTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
505c6d53760fd85c8c0a30b3d1048a7f0745fee6 26-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix PhoneSwitcherTest
am: 6ffa56f54d

* commit '6ffa56f54d0318c10526b8a64f85ed0841de5380':
Fix PhoneSwitcherTest
d2ffcaf3bee89edd228d6a9d603df8d6c434ea67 26-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> resolve mrege conflicts of 6a49b2401a to nyc-dev

Change-Id: I61ec6a761ea05c9437aea3000f65909c440aaf9c
5ba11026cbe45b32a4a37292f9b47c4585ced72f 25-Feb-2016 Jack Yu <jackyu@google.com> Merge "Fixed data retry issues." into mm-wireless-dev
6ffa56f54d0318c10526b8a64f85ed0841de5380 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix PhoneSwitcherTest

Meant to go from score 0 -> 100 -> 0 and check for changes but
instead did 0 -> 100 -> 100.

Change-Id: I0ac3378809bf2914d3c36514030a29b4e9028851
om/android/internal/telephony/PhoneSwitcherTest.java
5eccb26b2bcf3a51326596e1b0bb49b073d2f9fc 23-Feb-2016 Abhijith Shastry <ashastry@google.com> Suppress blocks after texting emergency services.

BUG: 26989170
Change-Id: I73216e5c433ba4ffb613d88b1d3fe3c81f3acba9
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
df0b65dd8b2f4823c4781464f462509cf8fca709 24-Feb-2016 Abhijith Shastry <ashastry@google.com> Use mock service manager services in WapPushOverSmsTest.

This enables the test to be pass without valid sub ids.

BUG: 26682753
Change-Id: I601e8949f31db71133b53c45d3b1e47be6dad72f
om/android/internal/telephony/WapPushOverSmsTest.java
3baedf2ead743a2c67dcac03733cec52bcef5636 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Don't let other networks fool the Switcher

It needs to be aware of all NetworkRequests regardless of whether
higher-scored NetworkFactories are satisfying them so we don't
switch off a phone just because we're on wifi.

Note that this behavior isn't necessarily bad, just a policy change,
unexpected and unwanted.

bug:27340021
Change-Id: I10a8d66c4117cbcb5db898c47f7cbdb1e2beb45b
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/PhoneSwitcherTest.java
om/android/internal/telephony/mocks/ConnectivityServiceMock.java
f3c2b6b93f3e0b649a16c1f3a7cf4272aab7f649 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix ServiceStateTracker.pollState with radio-off.
am: 7d592679b9

* commit '7d592679b92a2fb35514193f2f95cd0138035050':
Fix ServiceStateTracker.pollState with radio-off.
7d592679b92a2fb35514193f2f95cd0138035050 18-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix ServiceStateTracker.pollState with radio-off.

IWLAN change dropped the "break" line causing us to always send
another round of ril requests even when the radio is off.

Change-Id: If838438c742abb4056a64fc7ae30afd53e7e229e
om/android/internal/telephony/ServiceStateTrackerTest.java
d4d5c4cf2a49a413113febb9bf159906d0a47441 24-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for GsmCdmaPhone (handling of messages rcvd on creation)" into mm-wireless-dev
am: ab57df1198

* commit 'ab57df1198ac3b7876e7c62a5c7a393e5bad3681':
Unit test for GsmCdmaPhone (handling of messages rcvd on creation)
14bdfdca7a5412edf5fbdd6573e0f608233a5ae8 24-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for GsmCdmaPhone (handling of messages rcvd on creation)

Includes access modifier cleanup in Phone

Bug: 25691379
Change-Id: If14eba8665f031c866a5d199078317d9d9e1291d
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/mocks/PhoneMock.java
282e49e614393f9a597f058fe6fe3185c02ded94 24-Feb-2016 fionaxu <fionaxu@google.com> fix GsmCdmaCallTrackerTest failures

BUG=25691379

Change-Id: I322a92d7f3706d68687cc9e75248a593fb1aef0e
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
75ba09a17a669f4906268088a769836aa87d8241 19-Feb-2016 fionaxu <fionaxu@google.com> ImsPhoneCallTracker Test

bug: 25691379
Change-Id: Iaa258417cea39e82325fa812fc7b6fdce4bd5cfc
om/android/internal/telephony/ImsPhoneCallTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
f5c24214ded1e0b49f91844bc987bd6f5c17e4e2 23-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix tests.

Alter precidence so manually added things turn up before empty
mocks.

Change-Id: I6348fc0d9326bfce448a21ec6aa5cc1dede4d0f6
om/android/internal/telephony/ContextFixture.java
7d6d7d6cb68ee37b4bee33588ba2594e9cf0c197 23-Feb-2016 Jack Yu <jackyu@google.com> Fixed data retry issues.

1. Fixed that data retry does not happen on time. Now we use the
exact timer to make sure retry will happen on time.
2. Fixed that data retry timer got started twice every time when retry
should happen.

bug: 27293537, 27158552
Change-Id: I05bbf0cb2717269984f3dc892af2a7a438ffd8f0
om/android/internal/telephony/DcTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
a2aba60f44c9303eea7574449d5cc187a150877e 23-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Add unit tests for message blocking." into nyc-dev
e2435e2d37c991bd6209a90cd884b5102939872e 21-Feb-2016 Abhijith Shastry <ashastry@google.com> Add unit tests for message blocking.

BUG: 26682753

Change-Id: I4f1eddc94863f29cb55b9242fe76c1836948978b
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/WapPushOverSmsTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
7c6359fc07840f8ed59161a7caf51634115a5d7e 22-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge changes from topic 'DCT_refactor_nyc' into nyc-dev

* changes:
Remove DctController
Create TelephonyNetworkFactory.
Make PhoneSwitcher class.
Create the new SubscriptionMonitor
05f6a963afc1aade7b58ad757c6e64385ab61fe4 22-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Fix intermittent test failure of GsmCdmaCTTest" into nyc-dev
52260e76d4097bea18e610688f8a548a834a0c1f 22-Feb-2016 fionaxu <fionaxu@google.com> Fix intermittent test failure of GsmCdmaCTTest

bug: 25691379
Change-Id: Ia59413cc019e849267a48c166619f3a6e549d6eb
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
e9bf1f44cc6a888fff8419c8f35612d503ba3216 05-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Create TelephonyNetworkFactory.

It replaces DctController. Also adds tests.

Change-Id: I7cff9197fe26dee3eb7df9be166b92e4c26e8970
om/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
om/android/internal/telephony/mocks/DcTrackerMock.java
om/android/internal/telephony/mocks/PhoneSwitcherMock.java
om/android/internal/telephony/mocks/SubscriptionMonitorMock.java
6bfc71d2b5340f6274b3e63926a7068e364fc9ff 28-Jan-2016 Robert Greenwalt <rgreenwalt@google.com> Make PhoneSwitcher class.

Monitors subscription->phone mapping, default subscription setting and
all mobile network requests to prioritize things, activate/deactivate phones
and also notify the curious about which phones are currently active.

Change-Id: I0ee67e6b05a5571b2f3c4e641823cf029420cb50
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/PhoneSwitcherTest.java
om/android/internal/telephony/mocks/ConnectivityServiceMock.java
om/android/internal/telephony/mocks/PhoneMock.java
om/android/internal/telephony/mocks/SubscriptionControllerMock.java
7a477263108748903cf5a4151a4e8b739f12264a 16-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Create the new SubscriptionMonitor

Add some unit tests too.

Change-Id: I9e40be14d61f8f43d6bd37915f0c2ab5b3bf8289
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/SubscriptionMonitorTest.java
om/android/internal/telephony/mocks/SubscriptionControllerMock.java
om/android/internal/telephony/mocks/TelephonyRegistryMock.java
af5593594070f825032be46dced573cd195956e1 05-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Create TelephonyNetworkFactory.

It replaces DctController. Also adds tests.

Change-Id: Ib2dd309bd9f87f9b9d4ca114440e6251c562e925
om/android/internal/telephony/dataconnection/TelephonyNetworkFactoryTest.java
om/android/internal/telephony/mocks/DcTrackerMock.java
om/android/internal/telephony/mocks/PhoneSwitcherMock.java
om/android/internal/telephony/mocks/SubscriptionMonitorMock.java
bc2eba9036e430ea40a47ab708c0386fa567ec9c 28-Jan-2016 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Make PhoneSwitcher class.

Monitors subscription->phone mapping, default subscription setting and
all mobile network requests to prioritize things, activate/deactivate phones
and also notify the curious about which phones are currently active.

Change-Id: I933876a018aebbbcfd86f48451d8b6e47646266e
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/PhoneSwitcherTest.java
om/android/internal/telephony/mocks/ConnectivityServiceMock.java
om/android/internal/telephony/mocks/PhoneMock.java
om/android/internal/telephony/mocks/SubscriptionControllerMock.java
e5e4b94927937ac5cbc83ac577d4a572fa412784 16-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Create the new SubscriptionMonitor

Add some unit tests too.

Change-Id: I2b8d36ccd254a8b6743137dcc8593fb8171de6d3
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/SubscriptionMonitorTest.java
om/android/internal/telephony/mocks/SubscriptionControllerMock.java
om/android/internal/telephony/mocks/TelephonyRegistryMock.java
257a341cc5a2f42e42e89c580dd254905e985dae 20-Feb-2016 Jack Yu <jackyu@google.com> Fixed the broken DcTracker tests.
am: 783e33ac9e

* commit '783e33ac9e332b7eefa6bb125fbdb82e0c928c73':
Fixed the broken DcTracker tests.
783e33ac9e332b7eefa6bb125fbdb82e0c928c73 20-Feb-2016 Jack Yu <jackyu@google.com> Fixed the broken DcTracker tests.

bug: 25691379
Change-Id: I21ff98d69b400ff50da857047fa245003681821e
om/android/internal/telephony/DcTrackerTest.java
b7cb7e0f0f66a859701ca6ccf1f864f1aca2defb 19-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test for ImsPhoneCall/GsmCdmaCall" into mm-wireless-dev
am: a35ed15471

* commit 'a35ed15471e98c2d6a25d12ee89156d4b815dd55':
Unit test for ImsPhoneCall/GsmCdmaCall
a35ed15471e98c2d6a25d12ee89156d4b815dd55 19-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test for ImsPhoneCall/GsmCdmaCall" into mm-wireless-dev
468dcf57c026a5eebac700479b518ed8c35f4c6b 19-Feb-2016 Jack Yu <jackyu@google.com> First DcTracker unit test case.
am: 27b650c406

* commit '27b650c406018355a88a41528db7859e232728a0':
First DcTracker unit test case.
27b650c406018355a88a41528db7859e232728a0 18-Feb-2016 Jack Yu <jackyu@google.com> First DcTracker unit test case.

bug: 25691379
Change-Id: Ic091ae4d92d0ef1f3eaa9b3d0736545edb2f359f
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/DcTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
51bf0be2173a441cfde793fefff345383a423ccc 19-Feb-2016 Jack Yu <jackyu@google.com> Fixed two flaky tests.
am: 325ea5a0aa

* commit '325ea5a0aa71b9ff6134be71a84a7e1a288c70cb':
Fixed two flaky tests.
27f471647b2da3ff50620a766c048ebef8d45ae1 18-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit tests for InboundSmsHandler.

Bug: 25691379
Change-Id: I5fcbc95467cc7bd75f3f8a7da42c3814c1d2dac8
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
325ea5a0aa71b9ff6134be71a84a7e1a288c70cb 18-Feb-2016 Jack Yu <jackyu@google.com> Fixed two flaky tests.

bug: 25691379
Change-Id: I85307b6585f15ab39f4bee7f3d0f344dc31cb134
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/TelephonyTest.java
5adf9491b7fad9d3201fae7622810ce72eb3ace7 18-Feb-2016 fionaxu <fionaxu@google.com> Unit test for ImsPhoneCall/GsmCdmaCall

bug: 25691379

Change-Id: Idb3bf413734db549533b5e3b67ed01eaa76b9a49
om/android/internal/telephony/GsmCdmaCallTest.java
om/android/internal/telephony/ImsPhoneCallTest.java
b456cd0d4709a7a4d6eb7f35394ebba00895b133 18-Feb-2016 Chen Xu <fionaxu@google.com> Merge "ImsPhoneConnection Unit Test" into mm-wireless-dev
am: 0c0e3fa5a5

* commit '0c0e3fa5a512ef858a0713bb2d4320ad05968b3a':
ImsPhoneConnection Unit Test
f9b150b221db15e88b97a0b9c0971ca3c71c0313 17-Feb-2016 fionaxu <fionaxu@google.com> ImsPhoneConnection Unit Test

bug: 25691379

Change-Id: I97709053f4f1265646c4b8a03c314b3fc88caf4a
om/android/internal/telephony/ImsPhoneConnectionTest.java
om/android/internal/telephony/TelephonyTest.java
20d12997d5a4528cc8cf3d353861531a4fa78c2a 17-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 5075b84c9a to nyc-dev

Change-Id: I75b3704a1423cf872d4c8a52d09a4a0934c2ee26
217d4d9562a9476cf579dfc409b1278a02b18b87 17-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix failing sms tests.

Bug: 25691379
Change-Id: I2eb8b0510905066058179ea5d93a2719d6dac74f
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
41700dcc15f0e9d31ba94422c47243ff432aa372 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Updates to InboundSmsHandler tests and sendOrderedBroadcast support" into nyc-dev
05ce040e990b396a4273dc9c8efde364a2afb5bc 12-Feb-2016 Amit Mahajan <amitmahajan@google.com> Updates to InboundSmsHandler tests and sendOrderedBroadcast support

Bug: 25691379

Change-Id: I49b06a5223f1e9693e747282f7a83a1322bb887f
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
0c342d95e06f85fa56e576025ebcf4f70bc04d67 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Ic8e5b8c9,I08edb714 into mm-wireless-dev
am: 7efd41c8db

* commit '7efd41c8dbd2822c53bfddeb10a612c916a7daff':
Unit tests for CallForwardingOption in GsmCdmaPhone
Support for storing voicemail count for multi-sim.
7efd41c8dbd2822c53bfddeb10a612c916a7daff 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Ic8e5b8c9,I08edb714 into mm-wireless-dev

* changes:
Unit tests for CallForwardingOption in GsmCdmaPhone
Support for storing voicemail count for multi-sim.
8969bb8d9da04515c7e9e86d7bf29a3d92708600 16-Feb-2016 Jack Yu <jackyu@google.com> Removed the flaky SmsApplicationTest
am: 3981c31c20

* commit '3981c31c2029777846c04756af30bd4574c41b41':
Removed the flaky SmsApplicationTest
3981c31c2029777846c04756af30bd4574c41b41 16-Feb-2016 Jack Yu <jackyu@google.com> Removed the flaky SmsApplicationTest

Change-Id: Ibe16c54d9a7ba0239a75e1eb2de55352820ce598
om/android/internal/telephony/SmsApplicationTest.java
077adbc4774b07e56293a4e1095fc2a921ebc2dc 13-Feb-2016 Jack Yu <jackyu@google.com> Added debug messages.
am: d48b468a5f

* commit 'd48b468a5f16a8b354e565edd78710a9a17aeec5':
Added debug messages.
d48b468a5f16a8b354e565edd78710a9a17aeec5 13-Feb-2016 Jack Yu <jackyu@google.com> Added debug messages.

Change-Id: I14aba12d20d3a1268c8dd60c3e3a154d658439c3
om/android/internal/telephony/SmsApplicationTest.java
bbfac15cfb71ce969f2426bd1e0bf12dc48f8516 13-Feb-2016 fionaxu <fionaxu@google.com> Telephony Unit Test Clean Up
am: 703e603fec

* commit '703e603fecd2a07e232afe1e2b277fd0a786237b':
Telephony Unit Test Clean Up
703e603fecd2a07e232afe1e2b277fd0a786237b 13-Feb-2016 fionaxu <fionaxu@google.com> Telephony Unit Test Clean Up

bug: 25691379

Change-Id: Ic5b424d8bed2229efe32379090053561496f78fa
om/android/internal/telephony/CallManagerTest.java
om/android/internal/telephony/CallStateExceptionTest.java
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/SignalToneUtilTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
2d6df73e3bebb7d6aebd628730b9d20b23f1637a 11-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for CallForwardingOption in GsmCdmaPhone

Bug: 25691379
Change-Id: Ic8e5b8c96d93f9c3a09b0a2f7a22e9357372ba9c
om/android/internal/telephony/GsmCdmaPhoneTest.java
2cc7f4762438942b0c6b098fa9bd248c29fbd471 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev
am: 3d141ae13b

* commit '3d141ae13bb5b109f831c16bfd886cfef649958e':
Subscription related Unit test with code cleanup
3d141ae13bb5b109f831c16bfd886cfef649958e 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev
655bae990bdd7e4584491def4d30692e6173779c 11-Feb-2016 fionaxu <fionaxu@google.com> Subscription related Unit test with code cleanup

bug: 25691379

Change-Id: Ib31b34b3d1116cf714717f5742095de7aa4c0a13
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/SmsNumberUtilsTest.java
om/android/internal/telephony/SubscriptionControllerTest.java
om/android/internal/telephony/SubscriptionInfoTest.java
om/android/internal/telephony/SubscriptionInfoUpdaterTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/TelephonyUtilsTest.java
7135943381c6ee4b8c76d2c26ab13a1a94f31ee3 12-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "DO NOT MERGE Updates to InboundSmsHandler tests and sendOrderedBroadcast support" into mm-wireless-dev
b2b936f797278f8f202f7f338a0854bffea33328 12-Feb-2016 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE Updates to InboundSmsHandler tests and sendOrderedBroadcast support

Bug: 25691379

Change-Id: I49b06a5223f1e9693e747282f7a83a1322bb887f
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
10e67d9d55a81ad7fab440d46582351427fd16bd 12-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added one more test for debugging tests failure." into mm-wireless-dev
am: f853d72d99

* commit 'f853d72d99f0e6954d2e1d93b2b5d3decac2e4ce':
Added one more test for debugging tests failure.
b4813c5483f45ea9828c19dfdca86ee77ca05e67 12-Feb-2016 Jack Yu <jackyu@google.com> Added one more test for debugging tests failure.

Change-Id: I6762a0b8295158b105944424e415edb86d855f4b
om/android/internal/telephony/SmsApplicationTest.java
cd742424196b9b2e9eb0602392f49ac2f61124cb 12-Feb-2016 Jack Yu <jackyu@google.com> Added more debug messages.
am: b08621abc0

* commit 'b08621abc0d22cff9404734eddee4e67870d31e7':
Added more debug messages.
b08621abc0d22cff9404734eddee4e67870d31e7 12-Feb-2016 Jack Yu <jackyu@google.com> Added more debug messages.

Change-Id: I63de0f2376ba84a4b8f7a3241d1e4cac27c7f34d
om/android/internal/telephony/SmsApplicationTest.java
97b3c4e45f156d8d5ae25a32357c9b31e018da32 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Support for storing voicemail count for multi-sim.

Bug: 18108420
Change-Id: I08edb714b839b44472b3b7a4d0aba287da2969d3
om/android/internal/telephony/GsmCdmaPhoneTest.java
f4dbf41bcccd167d73aa9ff0f04dda115227a923 12-Feb-2016 Jack Yu <jackyu@google.com> Added debug messages for failing tests.
am: 1178de7783

* commit '1178de77832c5cf13cbc81fcf547437e432299cb':
Added debug messages for failing tests.
1178de77832c5cf13cbc81fcf547437e432299cb 12-Feb-2016 Jack Yu <jackyu@google.com> Added debug messages for failing tests.

bug: 25691379
Change-Id: Ie1247c5fb2692785f004b49bd5b57c21314f6d7b
om/android/internal/telephony/SmsApplicationTest.java
04fba990233db3d49e20c93be646feea9f5f6a6c 11-Feb-2016 Jack Yu <jackyu@google.com> Test infrastructure improvement and code clean up.
am: 9c96807d99

* commit '9c96807d990cdd3f4bb2d3f0fd56a1e78a95b353':
Test infrastructure improvement and code clean up.
9c96807d990cdd3f4bb2d3f0fd56a1e78a95b353 10-Feb-2016 Jack Yu <jackyu@google.com> Test infrastructure improvement and code clean up.

Added instance replacement infrastructure and auto-restore functionality.
Cleauped up test cases.
Fixed copyright year.

bug: 25691379
Change-Id: I7e9b0b121c38c3a2c7375b262e2a121abb9c9a59
om/android/internal/telephony/CallManagerTest.java
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaCallTest.java
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/InboundSmsTrackerTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/SmsApplicationTest.java
om/android/internal/telephony/SmsNumberUtilsTest.java
om/android/internal/telephony/SmsStorageMonitorTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/TelephonyTestUtils.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestApplication.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
om/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
2d8b2d05aca65912c035a5c948fde8f622fe3e7b 11-Feb-2016 Jack Yu <jackyu@google.com> Merge "Revert "Test infrastructure improvement and code clean up."" into mm-wireless-dev
am: 3c3afb81e4

* commit '3c3afb81e4811d1762d7fb9257151d85b1942875':
Revert "Test infrastructure improvement and code clean up."
28ad08f74f03b713efe788d77665235a73f50c46 11-Feb-2016 Jack Yu <jackyu@google.com> Test infrastructure improvement and code clean up.
am: 01d7b95381

* commit '01d7b95381a5247520e7fe4ac40d10bcced525cf':
Test infrastructure improvement and code clean up.
21e1b42d578d90611f76c37d58841543821502fd 10-Feb-2016 Jack Yu <jackyu@google.com> Revert "Test infrastructure improvement and code clean up."

This reverts commit 01d7b95381a5247520e7fe4ac40d10bcced525cf.

Change-Id: I2cb03e799dc5ce2a3bd1bcf8da21fb5fe7043672
om/android/internal/telephony/CallManagerTest.java
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaCallTest.java
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/InboundSmsTrackerTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/SmsApplicationTest.java
om/android/internal/telephony/SmsNumberUtilsTest.java
om/android/internal/telephony/SmsStorageMonitorTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/TelephonyTestUtils.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestApplication.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
om/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
01d7b95381a5247520e7fe4ac40d10bcced525cf 10-Feb-2016 Jack Yu <jackyu@google.com> Test infrastructure improvement and code clean up.

Added instance replacement infrastructure and auto-restore functionality.
Cleauped up test cases.
Fixed copyright year.

bug: 25691379
Change-Id: Ie3c778df828575d10e9164922210cc5b05723b45
om/android/internal/telephony/CallManagerTest.java
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaCallTest.java
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/InboundSmsTrackerTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/SmsApplicationTest.java
om/android/internal/telephony/SmsNumberUtilsTest.java
om/android/internal/telephony/SmsStorageMonitorTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/TelephonyTestUtils.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestApplication.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
om/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
85c521be473eb6745375076fbcec93bac2331833 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 3ece113cce to nyc-dev.

Change-Id: Iebb82d498d6e203376e2abd25f51ef5092529035
153077e0b2d9ff6f115a0739dac1d64931bffb91 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Update voicemail number related unit test.

Bug: 25691379
Change-Id: Ia80a455c99a21f50348d9ca3ef2b3e69179c93e7
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/TelephonyTest.java
306ab2c93d1a1102c3029fd95e2c586a0f82091e 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests

Bug: 25691379
Change-Id: I323fdef84792459db312df7bd58917e52a1a995e
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
abb3502255794a3ae7631b77fc23367a68f0c952 09-Feb-2016 Brian Carlstrom <bdc@google.com> Revert "New unit test for GsmCdmaPhone and fixes for some existing tests"

This reverts commit a57aed75dc5d8546afd8b88eab11cc5591068b69, reversing
changes made to eaa22b28cdb10244865e8d163c19ff27d0c9c5e2.
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
a57aed75dc5d8546afd8b88eab11cc5591068b69 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests
am: 7886780382

* commit '78867803826b15ff95c8ee8c7c6f65dfb7ad258f':
New unit test for GsmCdmaPhone and fixes for some existing tests
78867803826b15ff95c8ee8c7c6f65dfb7ad258f 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests

Bug: 25691379
Change-Id: I323fdef84792459db312df7bd58917e52a1a995e
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
eaa22b28cdb10244865e8d163c19ff27d0c9c5e2 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix locally failing tests.
am: 7be665f8b5

* commit '7be665f8b55afde15fde2b0cd93e5c0c20a12c0f':
Fix locally failing tests.
7be665f8b55afde15fde2b0cd93e5c0c20a12c0f 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix locally failing tests.

Delay should be added on test thread, not on HandlerThread

Bug: 25691379
Change-Id: Ibe902cfe10a3a1d4cd3519732b2753c6575e19eb
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/UiccControllerTest.java
c6066b0412d49c10688adb922c9e38098665a608 08-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added SmsApplication unit tests." into mm-wireless-dev
am: 6a5e8b0b7f

* commit '6a5e8b0b7faec25d6147062fdfc614588973c883':
Added SmsApplication unit tests.
6a5e8b0b7faec25d6147062fdfc614588973c883 08-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added SmsApplication unit tests." into mm-wireless-dev
0628ce336e8613a6c4357f80c70c602b515cc75f 08-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of f152b32a20 to nyc-dev.

Change-Id: Ibebb53f34f233bc87eec1ea29322b6218203a787
f152b32a20be664788536a223b9ac7a52f69e4dd 06-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix failing tests by cleaning up properly in tearDown.

Bug: 25691379
Change-Id: I829278ee371e9903e73891cee2a0986686d72ee5
om/android/internal/telephony/CallManagerTest.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/UiccControllerTest.java
om/android/internal/telephony/WapPushOverSmsTest.java
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
d32335400b5f667e4d5157c90e07c700f7b9306c 08-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix for WapPushOverSmsTest" into mm-wireless-dev
am: 70db77ecbe

* commit '70db77ecbee82d0caa0100a8a178decace504289':
Fix for WapPushOverSmsTest
70db77ecbee82d0caa0100a8a178decace504289 08-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix for WapPushOverSmsTest" into mm-wireless-dev
e20cc9c9d7c77b93b3e9df1f6d05d1c0481d4bdb 08-Feb-2016 Chen Xu <fionaxu@google.com> Merge "handle diff systemproperties to fix Test failures" into mm-wireless-dev
am: 3166507c08

* commit '3166507c08e05fc6e8cef024705f1a710e9ce0e2':
handle diff systemproperties to fix Test failures
3166507c08e05fc6e8cef024705f1a710e9ce0e2 08-Feb-2016 Chen Xu <fionaxu@google.com> Merge "handle diff systemproperties to fix Test failures" into mm-wireless-dev
73738eba042c5592e5da749a237c71f9700245d8 08-Feb-2016 Jack Yu <jackyu@google.com> Added SmsApplication unit tests.

bug: 25691379
Change-Id: I143d60d48b20fb81b81b2ceef209e0a088bba26d
om/android/internal/telephony/SmsApplicationTest.java
b9d551db1795b30598e2ce98cfae7106788c12d6 05-Feb-2016 fionaxu <fionaxu@google.com> handle diff systemproperties to fix Test failures

BUG=25691379

Change-Id: I13c079a26dc1c1a971471bef55770b97d489e39f
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/UiccControllerTest.java
03986793ad391a2c01d1fcb4b0fabeb8492bd81a 06-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix for WapPushOverSmsTest

Bug: 25691379
Change-Id: I1fada16caf8297c988a5517f79674c40295e581a
om/android/internal/telephony/WapPushOverSmsTest.java
98dabb4505f072a7997ded2a1db47748f5032485 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for WapPushOverSms
am: 60a81bdb47

* commit '60a81bdb47cf64972c8edf5b0c51e8059765e5a0':
Unit test for WapPushOverSms
60a81bdb47cf64972c8edf5b0c51e8059765e5a0 28-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for WapPushOverSms

Bug: 25691379
Change-Id: I26eebb8711c9369c5ab85e740254a86483125bf5
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/WapPushOverSmsTest.java
3d8b5728d4749bc706a519b39363f78a9044e2aa 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of defb36a05c to master.

Change-Id: I4816896984128102c6856e147634f2adf16b249a
defb36a05c3d7a05bde06ddfa8e9bd1570d4a8f5 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Hardcode locale in tests to Locale.US" into mm-wireless-dev
6315de4c732fa4a04cb266b747aeed59e281fa12 05-Feb-2016 fionaxu <fionaxu@google.com> fix build break
am: 4a9f066fbc

* commit '4a9f066fbcbd20e2ea3ca3cbc914f81b230e3825':
fix build break
4a9f066fbcbd20e2ea3ca3cbc914f81b230e3825 05-Feb-2016 fionaxu <fionaxu@google.com> fix build break

Change-Id: I056a07b43fa2ad01e73bb2a2c80377a1d47b468e
om/android/internal/telephony/TelephonyTest.java
4529bc6182356e5d5144e0d79402acbda37ca290 05-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test of CallManager,SignalToneUtil etc" into mm-wireless-dev
am: 94d23c79d5

* commit '94d23c79d57080903850d9c9974c96ad6ea84f59':
Unit test of CallManager,SignalToneUtil etc
94d23c79d57080903850d9c9974c96ad6ea84f59 05-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test of CallManager,SignalToneUtil etc" into mm-wireless-dev
2f2dba9413a3f14da0bcf45031986eb78f007dd8 04-Feb-2016 fionaxu <fionaxu@google.com> Unit test of CallManager,SignalToneUtil etc

BUG=25691379
Change-Id: I8a797b6c31c5adfdbbe62003e78f6c9ebed8d5a3
om/android/internal/telephony/CallManagerTest.java
om/android/internal/telephony/CallStateExceptionTest.java
om/android/internal/telephony/SignalToneUtilTest.java
om/android/internal/telephony/TelephonyTest.java
cbe5874f0032a93b81c842db992de850fba7ed2e 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Hardcode locale in tests to Locale.US

Bug: 25691379
Change-Id: I59fe0cd44e675dbd5e586cae9c9750eab7f607d7
om/android/internal/telephony/ContextFixture.java
7563f0fd6ce84d2231de40b82966d01d2c617ee0 05-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added Sms 7-bit encoding translation unit tests" into mm-wireless-dev
am: 85679f126b

* commit '85679f126bd12a8f6dd05dd6ccf05f341895da0a':
Added Sms 7-bit encoding translation unit tests
85679f126bd12a8f6dd05dd6ccf05f341895da0a 05-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added Sms 7-bit encoding translation unit tests" into mm-wireless-dev
53d5c275b3005ce7911e5254d7c9efd4197e39ec 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add annotations to tests to enable continuous testing." into mm-wireless-dev
am: 8a516cb868

* commit '8a516cb8682465eee7d40c508d90dfa8388bbef0':
Add annotations to tests to enable continuous testing.
8a516cb8682465eee7d40c508d90dfa8388bbef0 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add annotations to tests to enable continuous testing." into mm-wireless-dev
94d88f83be91e10c218c49d07b84ca458848814b 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix failing unit tests (testNewSms)."
1fe1dbf473755c4e812a1218f331759eccacb447 05-Feb-2016 Jack Yu <jackyu@google.com> Added Sms 7-bit encoding translation unit tests

bug: 25691379
Change-Id: Ic362c92a699390cb69299992b1f7155d8712f5e5
om/android/internal/telephony/Sms7BitEncodingTranslatorTest.java
om/android/internal/telephony/TelephonyTest.java
e35909567b6b5d21b50a3f1fbdc8d1a737882f46 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix failing unit tests (testNewSms).

Bug: 25691379
Change-Id: I7c14bc5f140c7bd11a19a25899e3f2b02aafab15
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
e9c269de6e4db5889ae11d5b853b35b51becf87b 04-Feb-2016 Chen Xu <fionaxu@google.com> Merge "UICC card and UICC controller Unit test mergeback"
0158cae1b757c784b10552abbc95ebb915dc1379 04-Feb-2016 fionaxu <fionaxu@google.com> GsmCdmaCallTrackerTest
am: 5bc609873d

* commit '5bc609873dfd5a4c51798139512c206ac0ab7503':
GsmCdmaCallTrackerTest
5bc609873dfd5a4c51798139512c206ac0ab7503 04-Feb-2016 fionaxu <fionaxu@google.com> GsmCdmaCallTrackerTest

Change-Id: I752b117b227bb785dd85bd8a2b248e13793034fa
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
241816eb59ba9b1f9ffeef16bafbd30918109a6b 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Use getDefault() instead of deprecated api to get Locale in tests."
19094f4d2c99229d56d4e2a748e91e2575c7764e 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Use getDefault() instead of deprecated api to get Locale in tests.

Bug: 25691379
Change-Id: I92f61b642dbd96b008aada42d5580690f6715b11
om/android/internal/telephony/ContextFixture.java
51ba62331ccc519ba00801f9036a32bf909048a9 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Adding some changes in ContextFixture to fix a failing test." into mm-wireless-dev
am: df913b3778

* commit 'df913b3778bcb0de74c4d9a077bbe76690ffef08':
Adding some changes in ContextFixture to fix a failing test.
df913b3778bcb0de74c4d9a077bbe76690ffef08 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Adding some changes in ContextFixture to fix a failing test." into mm-wireless-dev
8fa6dfb2cbdc35ea4d70add3f8d9172d2e18d650 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Add annotations to tests to enable continuous testing.

Bug: 25691379
Change-Id: Ibe66bf70b68983fa09a842933467379eefde518f
om/android/internal/telephony/CarrierAppUtilsTest.java
om/android/internal/telephony/GsmCdmaCallTest.java
om/android/internal/telephony/IntRangeManagerTest.java
om/android/internal/telephony/PhoneNumberWatcherTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
0a589b526040a348782f64b04084cb5fa955ff3e 01-Feb-2016 fionaxu <fionaxu@google.com> UICC card and UICC controller Unit test mergeback

BUG=25691379

Change-Id: Iefb6c01b6cbb7544f4a5a06ef3a44e0c0dcc89b8
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
ef24d7f6f4476b8806eb489f42a06bddeb38273b 04-Feb-2016 fionaxu <fionaxu@google.com> Potential fix for GsmCdmaCallTrackerTest & debug
am: 19561243b5

* commit '19561243b57cea1863585443a92801724d41a4d9':
Potential fix for GsmCdmaCallTrackerTest & debug
19561243b57cea1863585443a92801724d41a4d9 04-Feb-2016 fionaxu <fionaxu@google.com> Potential fix for GsmCdmaCallTrackerTest & debug

Change-Id: I3ac9b0bbe9200f9db5decf85adcea1de0d1717d0
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
ad5a18943efa9e3e536d1e853f87cc0180f1c5e5 04-Feb-2016 Jack Yu <jackyu@google.com> Added InboundSmsTracker unit test.

bug: 25691379
Change-Id: Iafde997e476a09d5590279fbabccd238d22488c0
om/android/internal/telephony/InboundSmsTrackerTest.java
0efec89bf932a4afca276577fd9de3f0c7d5346e 04-Feb-2016 Jack Yu <jackyu@google.com> DO NOT MERGE - Use the correct bytes to hex string method.

The old one broke the master build.

Change-Id: I14a6b76982b7122e1e0521ca729255559627dee4
om/android/internal/telephony/InboundSmsTrackerTest.java
c0b04ba6904d774e929645c95f7b85aebccff4df 04-Feb-2016 Ed Heyl <edheyl@google.com> revert fc8b5386 and 9bf2a929; broke the build.

Change-Id: I3a2dc4cded1cd6572e21994cb6da3e7e7bbc3502
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/InboundSmsTrackerTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
08de0e2dd4414051a3ac28907a5e22ed19f6ff83 04-Feb-2016 Chen Xu <fionaxu@google.com> Merge "UICC card and UICC controller Unit test" into mm-wireless-dev
am: ffe9936d2d

* commit 'ffe9936d2dc65d0a84c309cb8292680328d98018':
UICC card and UICC controller Unit test
0c51ecb1b32a2dfa39654741e405c7a790209740 04-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added InboundSmsTrackerTest unit tests." into mm-wireless-dev
am: 76c69fd1f3

* commit '76c69fd1f3f7c482a91844872e8d51ec49109cae':
Added InboundSmsTrackerTest unit tests.
ffe9936d2dc65d0a84c309cb8292680328d98018 04-Feb-2016 Chen Xu <fionaxu@google.com> Merge "UICC card and UICC controller Unit test" into mm-wireless-dev
76c69fd1f3f7c482a91844872e8d51ec49109cae 04-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added InboundSmsTrackerTest unit tests." into mm-wireless-dev
90e3fedce79c37345d8bdb846dcbf1bbef94768c 04-Feb-2016 Jack Yu <jackyu@google.com> Merge "Fix the neighboring CID on GSM(GPRS) network." into mm-wireless-dev
am: 716376f58f

* commit '716376f58f1ab675f56b967323d8073b4cf5be40':
Fix the neighboring CID on GSM(GPRS) network.
716376f58f1ab675f56b967323d8073b4cf5be40 04-Feb-2016 Jack Yu <jackyu@google.com> Merge "Fix the neighboring CID on GSM(GPRS) network." into mm-wireless-dev
fc8b538620604f2a518b8515761317df58be78bf 04-Feb-2016 Jack Yu <jackyu@google.com> Added InboundSmsTrackerTest unit tests.

bug: 25691379
Change-Id: I846ae185a5a722d7387e05efc60b5ab7f7fc6d87
om/android/internal/telephony/InboundSmsTrackerTest.java
66fb0378fd913dfe564c8e31b5ef379592242615 04-Feb-2016 Jack Yu <jackyu@google.com> Fix the neighboring CID on GSM(GPRS) network.

Set the data network type system properties with the correct RAT.

bug: 26956224
Change-Id: I2a046c3974930c25a2fb3c98cbfef76b83a0d8a3
om/android/internal/telephony/ServiceStateTrackerTest.java
dcc7d449682c75dd104bddf067d56850b146fedb 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Commenting out test code that's causing build failure.

Looks like the API being called is removed on master. Will fix
it correctly in another CL.

Change-Id: I9dabc9f03ffd67b36b67014faf2e9df91980fe97
om/android/internal/telephony/ContextFixture.java
71254c78051fc5e1ed204e99efceeec2a42287f8 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for GsmCdmaPhone." into mm-wireless-dev
am: ac529d09c1

* commit 'ac529d09c18fdec5a9a186b025aa2047dff5a0e4':
Unit tests for GsmCdmaPhone.
ac529d09c18fdec5a9a186b025aa2047dff5a0e4 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for GsmCdmaPhone." into mm-wireless-dev
981f8243ca4fb556d9fc6a4f1ac3dfa81af37583 03-Feb-2016 Chen Xu <fionaxu@google.com> Merge "improve debuggability for GsmCdmaCallTrackeTest" into mm-wireless-dev
am: 385bb1777c

* commit '385bb1777c3da3439e828cd264c59dc98e03b177':
improve debuggability for GsmCdmaCallTrackeTest
32b5fbb1a340fa16e2c37c276517ef10a4934500 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for GsmCdmaPhone.

Also creating abstract class TelephonyTest that can be extended
by other unit tests.

Bug: 25691379
Change-Id: I9437642a0bab68c6b573954e587181ff7d04d217
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/TelephonyTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
385bb1777c3da3439e828cd264c59dc98e03b177 03-Feb-2016 Chen Xu <fionaxu@google.com> Merge "improve debuggability for GsmCdmaCallTrackeTest" into mm-wireless-dev
b54a7201000c50c505814aa62e114010f5310d0f 03-Feb-2016 fionaxu <fionaxu@google.com> improve debuggability for GsmCdmaCallTrackeTest

Change-Id: Ic5dc3c707d335d73c453f3841b776cc61c59546d
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
967ead0803034a873559d06e38c2f4104b7e46a1 03-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added SMS number conversion unit tests." into mm-wireless-dev
am: d4d52e2ba0

* commit 'd4d52e2ba02224f53a5759b262614a06eb1c2d2c':
Added SMS number conversion unit tests.
d4d52e2ba02224f53a5759b262614a06eb1c2d2c 03-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added SMS number conversion unit tests." into mm-wireless-dev
97ef92758cd180f431f095e6bda6ea9f2676d933 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Adding some changes in ContextFixture to fix a failing test.

This also includes ContextFixture changes from ag/837521

Bug: 25691379
Change-Id: I94616574e1089b30b31b761c8ccdcfa201e64308
om/android/internal/telephony/ContextFixture.java
76ab58dd7f833c4cf275f778abae8bf3ed9227c0 02-Feb-2016 Jack Yu <jackyu@google.com> Added SMS number conversion unit tests.

Added unit test cases for 12 different types of number conversion.
Also deleted a non-valid service state tracker test.

bug: 25691379
Change-Id: I72afe8bf30237e10cc760b195d983c732210cdfa
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/SmsNumberUtilsTest.java
a8857077b00d6c2856b3335a62ac43ae5403c142 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Use the correct way to init SmsBroadcastUndelivered in tests

Change-Id: I8f02f12886277fe110615fe808f743d6e8ade363
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
4d08cf9c93ee762a345aa64c292ca065aa5e51c2 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for CdmaInboundSmsHandler" into mm-wireless-dev
am: 73ea88040f

* commit '73ea88040f7b17b3d0799c5918349adb68df3902':
Unit test for CdmaInboundSmsHandler
73ea88040f7b17b3d0799c5918349adb68df3902 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for CdmaInboundSmsHandler" into mm-wireless-dev
52f23cd068ffc05a2aaa101472d36a2861e55f29 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for CdmaInboundSmsHandler

Bug: 25691379
Change-Id: I523a9ccace6e00d4865cd682f242ed5a1d7e9afe
om/android/internal/telephony/cdma/CdmaInboundSmsHandlerTest.java
275d5734a38216f74ac1bc01f613dafabbf00f4b 03-Feb-2016 Chen Xu <fionaxu@google.com> Merge "increase wait time, potential fix for unit test" into mm-wireless-dev
am: 635b77ae05

* commit '635b77ae0587fe677a0b967b3c79460345721a23':
increase wait time, potential fix for unit test
9bf2a9297d37cdba05b023189c7a10357d8b0eee 01-Feb-2016 fionaxu <fionaxu@google.com> UICC card and UICC controller Unit test

BUG=25691379

Change-Id: Iefb6c01b6cbb7544f4a5a06ef3a44e0c0dcc89b8
om/android/internal/telephony/IccCardStatusTest.java
om/android/internal/telephony/UiccCardTest.java
om/android/internal/telephony/UiccControllerTest.java
635b77ae0587fe677a0b967b3c79460345721a23 03-Feb-2016 Chen Xu <fionaxu@google.com> Merge "increase wait time, potential fix for unit test" into mm-wireless-dev
832f315527d2f60708dc092137f59d02f2572a83 03-Feb-2016 fionaxu <fionaxu@google.com> increase wait time, potential fix for unit test

BUG=25691379

Change-Id: I49733a69e5a4fa38e498b4bf7a805f9f806a26b3
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
219069c3c199ead7435b52e1bb76d6a4ab69d7b0 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix unit test testNewSms for GsmInboundSmsHandler
am: f3ebcd1cda

* commit 'f3ebcd1cdac795a739b54412743e89f184249f96':
Fix unit test testNewSms for GsmInboundSmsHandler
f3ebcd1cdac795a739b54412743e89f184249f96 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix unit test testNewSms for GsmInboundSmsHandler

Bug: 25691379
Change-Id: I080f30a740083fb799dc070a3cee41fb3e696f25
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
4c83482965719a79a3e496028cb1ee21f5881d0f 02-Feb-2016 fionaxu <fionaxu@google.com> add eventlog mock for GsmCdmaCallTrackerTest Test
am: caf788f85d

* commit 'caf788f85debe35e07c1821f20ea8949b1c60c61':
add eventlog mock for GsmCdmaCallTrackerTest Test
caf788f85debe35e07c1821f20ea8949b1c60c61 02-Feb-2016 fionaxu <fionaxu@google.com> add eventlog mock for GsmCdmaCallTrackerTest Test

BUG=25691379

Change-Id: I400a0398a23cfb7ef98a845a2f4b154bfb2c15a4
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
d2ef08b831579cf78dbb0262abf5f04ae7e2698b 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "GsmCdmaConnection Unit Test" into mm-wireless-dev
am: 60dccc84d1

* commit '60dccc84d100201cb0593397c159b4799efb7f5d':
GsmCdmaConnection Unit Test
15c3f35b47d556463a6c47fb9eefc985e086d0aa 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test for GsmCdmaCallTracker" into mm-wireless-dev
am: e3b8bf78b6

* commit 'e3b8bf78b63c45806f28812a66174aa8222c2973':
Unit test for GsmCdmaCallTracker
60dccc84d100201cb0593397c159b4799efb7f5d 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "GsmCdmaConnection Unit Test" into mm-wireless-dev
e3b8bf78b63c45806f28812a66174aa8222c2973 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test for GsmCdmaCallTracker" into mm-wireless-dev
615dabe100445f7ea5dd3a570ce0c9082d5bef05 31-Jan-2016 Jack Yu <jackyu@google.com> Fixed the broken SPN tests
am: d9fa90aaab

* commit 'd9fa90aaab09dae08df2a097ac4d61cedb98672a':
Fixed the broken SPN tests
d9fa90aaab09dae08df2a097ac4d61cedb98672a 31-Jan-2016 Jack Yu <jackyu@google.com> Fixed the broken SPN tests

bug: 25793157
Change-Id: Id9752cf4e23759d26f0cf6037400055fd5efc039
om/android/internal/telephony/ServiceStateTrackerTest.java
29761e2efa6f68b32f102eda45daffb9b163ca77 30-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsStorageMonitor" into mm-wireless-dev
am: 2a70348811

* commit '2a703488110cac77b05d9106afbc24cfb57fb8e3':
Unit tests for SmsStorageMonitor
2a703488110cac77b05d9106afbc24cfb57fb8e3 30-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsStorageMonitor" into mm-wireless-dev
5d65624eb9189b0369bf1d914a9fb7e141284226 28-Jan-2016 fionaxu <fionaxu@google.com> GsmCdmaConnection Unit Test

BUG=25691379
Change-Id: I66679fdf5a9bd591e240b320a9ec9c565a5b4f46
om/android/internal/telephony/GsmCdmaConnectionTest.java
ceea0fa1248e326663ac56e5ba37b0633f8adacc 29-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for SmsStorageMonitor

Bug: 25691379
Change-Id: Iab7080afcd422d642b6d1be6d49e4f16ccf461fd
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/SmsStorageMonitorTest.java
5755ef622fec6f3c592467c685503826862a7536 26-Jan-2016 fionaxu <fionaxu@google.com> Unit test for GsmCdmaCallTracker

BUG=25691379
Change-Id: Ic588ed4b78d645008698bff73a2995bdfd15e064
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaCallTrackerTest.java
8164ed3cf55162f10ff43608a4df794a1de34055 29-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed two flacky service state tracker tests." into mm-wireless-dev
am: 5f2bc5e7b3

* commit '5f2bc5e7b344e32f1542e21b7f46939ad86195da':
Fixed two flacky service state tracker tests.
5f2bc5e7b344e32f1542e21b7f46939ad86195da 29-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed two flacky service state tracker tests." into mm-wireless-dev
44b9d5b470fb45c0f59073f56cb48a2501996259 29-Jan-2016 Jack Yu <jackyu@google.com> Fixed two flacky service state tracker tests.

Also fix the inconsistent way to get carrier config service
in service state tracker.

bug: 25691379
Change-Id: Ib725954d10d5515ac395a595df744353e788afe5
om/android/internal/telephony/ServiceStateTrackerTest.java
30c1dfa4580f7133392a345ea2dcd527b72fa70f 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "TelephonyEventLog: Add some unit tests and missing log events" into mm-wireless-dev
am: a8b33dee0b

* commit 'a8b33dee0bc27112a4c6cc9f8f733b03eb4ae3d0':
TelephonyEventLog: Add some unit tests and missing log events
a8b33dee0bc27112a4c6cc9f8f733b03eb4ae3d0 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "TelephonyEventLog: Add some unit tests and missing log events" into mm-wireless-dev
9746fca2d7389f0fce6d5d031d87acd87b9de723 28-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> TelephonyEventLog: Add some unit tests and missing log events

Also some code cleanup and minor bug fixes.

Change-Id: I327566f8c3839bf64aebc4db0c6170ba2bd7de87
om/android/internal/telephony/TelephonyEventLogTest.java
1974532bf0a56bfd4ad574a52e9007141f71ad12 28-Jan-2016 Jack Yu <jackyu@google.com> Added GSM cell location unit tests.
am: cde20aa353

* commit 'cde20aa353bb14806a9fe0445c51398cd3ab13c6':
Added GSM cell location unit tests.
cde20aa353bb14806a9fe0445c51398cd3ab13c6 28-Jan-2016 Jack Yu <jackyu@google.com> Added GSM cell location unit tests.

And also fixed the flacky test results by
adding delay at the end of setup to avoid
race condition.

bug: 25691379
Change-Id: If28884bf518d6590fdf7ae22dc6861b16b401535
om/android/internal/telephony/ServiceStateTrackerTest.java
89b9ae10ff672679a723c1fa3051357183a2390b 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Added few more unit tests for ServiceStateTracker" into mm-wireless-dev
am: 8472a8b04b

* commit '8472a8b04be0575ea3afc16e1a58e2431fc58d93':
Added few more unit tests for ServiceStateTracker
e5e0593e54a4e1009190dab5d6fd507dca0e341e 27-Jan-2016 Jack Yu <jackyu@google.com> Added few more unit tests for ServiceStateTracker

bug: 25691379
Change-Id: I405522b6b41d53ffcd5fae0fb261115e5d69b059
om/android/internal/telephony/ServiceStateTrackerTest.java
67e0eff10a285793b58027ebe2dcbf1ccbbce7b1 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for CdmaSmsDispatcher
am: 5d5ca33a24

* commit '5d5ca33a24e6b73a48b575a0e1a5e790784d0bb7':
Unit test for CdmaSmsDispatcher
5d5ca33a24e6b73a48b575a0e1a5e790784d0bb7 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for CdmaSmsDispatcher

Bug: 25691379
Change-Id: I9d4f209ad1a20435ae8841e5f15ce8a94b52fa42
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/cdma/CdmaSmsDispatcherTest.java
om/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
a31649954ec89e53b7012ed4c4a304f2142f8c3f 27-Jan-2016 Jack Yu <jackyu@google.com> Added cell info unit tests.
am: e2507b5326

* commit 'e2507b53266017e219a079f514801fe72ee90229':
Added cell info unit tests.
e2507b53266017e219a079f514801fe72ee90229 27-Jan-2016 Jack Yu <jackyu@google.com> Added cell info unit tests.

bug: 25691379
Change-Id: I4186ad702f9a701e7e882b16e54609124bb3568d
om/android/internal/telephony/ServiceStateTrackerTest.java
c33ffc6d7d7236b108f85d90fe2b7955f578d71c 27-Jan-2016 Ji Yang <yangji@google.com> Merge "Postpone inbound SMS processing until credential-encrypted storage is unlocked."
0b109c5f050cd64da76977ee6006090fbf06cecc 27-Jan-2016 Shishir Agrawal <shishir@google.com> Merge "Unhiding MSIM APIs."
2dd98153e03ca6f05fa22c4d165bda2c6e391e30 27-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed the flacky tests." into mm-wireless-dev
am: e7ee790b08

* commit 'e7ee790b08e2560e1496b77cfe999a1dd982307a':
Fixed the flacky tests.
6a787228dd7f63fbf035a49a3fc6eb784d6e4dc8 27-Jan-2016 Jack Yu <jackyu@google.com> Fixed the flacky tests.

Fixed the flacky tests by ignoring the broadcast order and supress
unwanted broadcasts.

bug: 25691379
Change-Id: Ic472d1970a9fb0aca23c3749a8c9c55d1c52bd95
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/ServiceStateTrackerTest.java
960c250fc2afee078852df1f37a887cec848ec5d 25-Jan-2016 Shishir Agrawal <shishir@google.com> Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
om/android/internal/telephony/ServiceStateTrackerTest.java
38ca51d0f643405df51e78fce6c546424e9f410d 25-Jan-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE : Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
om/android/internal/telephony/ServiceStateTrackerTest.java
8f21e0c6528f015924d153350dd2a717d3b51f66 21-Jan-2016 Ji Yang <yangji@google.com> Postpone inbound SMS processing until credential-encrypted storage is unlocked.

A notification will be shown to the user and the inbound SMS will be kept
inside the raw table until credentail-encrypted storage is unlocked.

Bug: 26232405
Change-Id: I2854ced55d911ccaf61df908d7c00f8acd5fae51
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
20c965e505306ebb6e2d06f1a0abe3cd3eadbd6e 25-Jan-2016 Jack Yu <jackyu@google.com> Merge "Added NITZ update test case." into mm-wireless-dev
339fadff86dd1add253a7571c8be35e51489111e 25-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "First unit test for GsmCellBroadcastHandler" into mm-wireless-dev
62f7e2b54fb3ad9f1139ceaf3b15966c000a9135 24-Jan-2016 Jack Yu <jackyu@google.com> Added NITZ update test case.

Added NITZ update test case.

bug: 25691379
Change-Id: I636e973daa81e2cf0f1cab67877535ec444f0bcc
om/android/internal/telephony/ServiceStateTrackerTest.java
3c7c2c2dfecfe11991f707a09ce79863e0ffdaa7 23-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for GsmCellBroadcastHandler

Bug: 25691379
Change-Id: I9e32eb7b55cf1f4edf35bf4c6786e5cc00db7870
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/gsm/GsmCellBroadcastHandlerTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
59d1e823d9aa8bc80ec6fd552fd85384bdfa75cd 22-Jan-2016 Jack Yu <jackyu@google.com> Added unit test for ServiceStateTracker.

Added testSpnUpdateShowPlmnOnly test which simulates the scenario
that only PLMN is shown but not SPN.

bug: 25691379
Change-Id: I65ae7d59d1fe6039997631152997dca17c8f390f
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/ServiceStateTrackerTest.java
6258465b5586a704a7762cb5c3e7bd3b66cca649 22-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "First unit test for GsmSMSDispatcher." into mm-wireless-dev
91680ad599f9e15a32c3a9798021778e8d4eab6e 22-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for GsmSMSDispatcher.

This includes a verifier class that can be used to check if a
function in RIL was called by the class under test.

Bug: 25691379
Change-Id: I187fe6c482dd6f32fbc4bdadb90e7a4412d7d795
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/TelephonyTestUtils.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
om/android/internal/telephony/gsm/GsmSmsDispatcherTest.java
ddc28e1e7dd574c22f19c5b1b251aa4c7ea74fd7 22-Jan-2016 Jack Yu <jackyu@google.com> Fixed the flacky set power test.

Mocked more stuffs to make sure the test run on more
deterministic code path.

bug: 25691379
Change-Id: I345f30cbfc879003ff233b35093d952c6c0a1669
om/android/internal/telephony/ServiceStateTrackerTest.java
0ffd5632e025ebbe0d3eedfda942f1fb07342a43 21-Jan-2016 Jack Yu <jackyu@google.com> Fixed the broken testSetRadioPower test again.

Added mocked content provider for system settings.

bug: 25691379
Change-Id: I983c46851469eb5c4e2871bf8975eef657cef7db
om/android/internal/telephony/ContextFixture.java
0e664d8c9ff3a1f2ab03d2bef4268615335ea1a2 17-Dec-2015 Jack Yu <jackyu@google.com> Data call retry refactoring

Moved retry manager from DataConnection to ApnContext.

bug: 22208242
Change-Id: I0baa80e06e6d815643782c2b549460547d0bfef9
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/TelephonyUtilsTest.java
ec334adf4017ca172f44612d01456e671f922344 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for SMS (EVENT_NEW_SMS in GsmInboundSmsHandler).

Bug: 25691379
Change-Id: Iacb24b23c224a8889cc549d02aa0dbd415e3c3d7
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
b6514b21f3d8ed47a088b741a18fe0b1de2308ea 15-Jan-2016 Jack Yu <jackyu@google.com> Fixed the broken testSetRadioPower test.

Fixed the broken testSetRadioPower test due to telephony debug
service change.

bug: 25691379
Change-Id: I1fb25671eda2ae53ba2165a0e0c64cc4525ac81b
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/ServiceStateTrackerTest.java
bba3bfb3b840ab938deaf4cf14881bc6d51c3e5c 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> Fix for failing unit test.

Bug: 25691379
Change-Id: I004f2990c9d30f697ce66cad2e5bae8c282eb083
om/android/internal/telephony/GsmCdmaPhoneTest.java
0c3ec24396bb8c21b4d89f743b626c13dd35ba7b 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Added unit tests for GsmCdmaPhone

Bug: 25691379
Change-Id: Ide4d50b10da332334fc4717ff1e7428f8b158056
om/android/internal/telephony/GsmCdmaPhoneTest.java
dd4b0f4b5a2def03bd45637be5ceed3e86781f68 16-Dec-2015 Amit Mahajan <amitmahajan@google.com> Added isPhoneTypeCdma() and isPhoneTypeCdmaLte()

Also includes:
- Removed unnecessary unreg/reg of phone with CallManager on
voice radio tech change. This is needed as otherwise Ims Phone may
get unreg but not reg again (on radio tech change).
- Allowing reg/unreg in GsmCdmaPhone regardless of phone type
- Removed unused Call.mIsGeneric

Bug: 25793157
Change-Id: Ie2093a50c1cf64918782076127decff90968fe72
om/android/internal/telephony/GsmCdmaPhoneTest.java
0a567c9ed954f295df83c753239646c6f6a04128 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Adding initial tests for GsmCdmaCall and GsmCdmaPhone.

Also includes:
- Changes to fix/comment out failing tests
- Some cleanup in CallManager related to deletion of PhoneBase and
PhoneProxy
- ContextFixture containing mock Context for all telephony tests
- Phone test that exercises BroadcastReceiver support in the mock
Context
- Test showing how static function can be mocked

Bug: 25691379
Change-Id: Ia38423cef3cfb86389d044cac4e601983fae1192
om/android/internal/telephony/ContextFixture.java
om/android/internal/telephony/GsmCdmaCallTest.java
om/android/internal/telephony/GsmCdmaConnectionTest.java
om/android/internal/telephony/GsmCdmaPhoneTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/ServiceStateTrackerTest.java
om/android/internal/telephony/SmsUsageMonitorShortCodeTest.java
om/android/internal/telephony/TestApplication.java
om/android/internal/telephony/TestFixture.java
aeb892fb006035636dd0959ad4e4f9cb106ac565 13-Nov-2015 Amit Mahajan <amitmahajan@google.com> Adding utility functions for using reflection.

Bug: 25691379
Change-Id: Id55b815d22954fb1f0876f4b0fbed9c39188f154
om/android/internal/telephony/TelephonyTestUtils.java
286fc2211b36fb3b7766f2a8e090b356427c2bc1 07-Jul-2015 Jeff Davidson <jpd@google.com> Don't toggle app state for updated system apps.

The default carrier app logic to disable/enable apps depending on the
SIM state should only apply to the copy of the app on /system. Once
the app has been updated via /data, we should leave the enabled
setting as the default (though we should still grant carrier
privileges as needed in this case).

Otherwise we may unexpectedly disable a previously enabled app if it
is updated and then the SIM state changes or device reboots at a time
when the SIM isn't loaded.

Bug: 22321187
Change-Id: Ia7281c5a174bd32fc4d63375603ace0b29794894
om/android/internal/telephony/CarrierAppUtilsTest.java
1d744e15a15081c74b96513ed1cc95a1739087bb 07-Jul-2015 Jeff Davidson <jpd@google.com> Don't kill carrier app when enabling it.

There's no reason to do this, and if the app is running it will cause
it to suddenly close despite already being enabled.

Bug: 22306627
Change-Id: Ic37ad74f92d50d49b329b8fb70ea171ff447091b
om/android/internal/telephony/CarrierAppUtilsTest.java
3c76dc89272d7b515d8afda1e7e9f7f362ef3caa 29-Jun-2015 Svet Ganov <svetoslavganov@google.com> Grant default permissons to the default SMS, Phone, Browser app.

bug:22104986

Change-Id: Idcbe85c43f995bdf37e7291c9384eb181560872d
om/android/internal/telephony/CarrierAppUtilsTest.java
c5ce7ea349f4d4ffc5bc1a07f95acc0ed68003f2 25-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Always regrant default permissions even if app is enabled." into mnc-dev
314fa4be00cb94d2617554351e13eafa0380b411 25-Jun-2015 Jeff Davidson <jpd@google.com> Always regrant default permissions even if app is enabled.

We can safely skip the call to setApplicationEnabledSetting in this
case, but we should still call grantDefaultPermissions to ensure that
we re-evaluate defaults when the carrier privilege rules has changed.

This fixes userdebug OTAs where the permissions are cleared, as we
were not re-granting them after the SIM was inserted, but it is safer
in general.

Bug: 22088420
Change-Id: Ied518653790e1fbf026cd3f0ec4de22e3b21f0ba
om/android/internal/telephony/CarrierAppUtilsTest.java
ebe753c8c4e103157b156922760a6e89f4d7a7ab 23-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Default permissions for carrier apps." into mnc-dev
03540ca93e3e59fd3cb826bb71716e54cb9dd095 23-Jun-2015 Jeff Davidson <jpd@google.com> Default permissions for carrier apps.

Provide the current list of carrier apps to PackageManager when we are
queried for them as part of granting default permissions. Trigger an
evaluation of default permissions whenever we are enabling a new
carrier app due to a change in SIM state (e.g. new carrier privilege
rules).

Bug: 21696731
Change-Id: I3d6d61712acb554878edeb5ee172887da16ef851
om/android/internal/telephony/CarrierAppUtilsTest.java
745e2f48f64d6a345aa9d2a9365ea2c5087aa54d 23-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Fix build of FrameworksTelephonyTests." into mnc-dev
0cdc53a095b5e715b9730f78dbd80d160fdd665f 19-Jun-2015 Jeff Davidson <jpd@google.com> Disable carrier apps until needed per the SIM.

Similar to how InputMethodManagerService marks IME apps as
DISABLED_UNTIL_USED except for apps being used as IMEs, we mark
carrier apps bundled with the system as DISABLED_UNTIL_USED until a
SIM that marks those apps as privileged is inserted.

Bug: 21814643
Change-Id: I24006039c18f2b0ad01019d3bb27c1344f97d53c
om/android/internal/telephony/CarrierAppUtilsTest.java
9ca2f3f4f29caafbbfb9e3b00d33b827e8448968 22-Jun-2015 Jeff Davidson <jpd@google.com> Fix build of FrameworksTelephonyTests.

An Android.mk file was missing to include these tests in the build,
and as a result many of them have broken. Disable the broken ones to
make the build work again. (The remaining tests may not be passing but
will at least build).

Bug: 22009112
Change-Id: I92b6f7407d3e6304514e9a8965c652671b8b85f5
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/ApnSettingTest.java.broken
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SMSDispatcherTest.java.broken
om/android/internal/telephony/TestPhoneNotifier.java
om/android/internal/telephony/TestPhoneNotifier.java.broken
om/android/internal/telephony/gsm/GSMPhoneTest.java
om/android/internal/telephony/gsm/GSMPhoneTest.java.broken
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GSMTestHandler.java.broken
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java.broken
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java.broken
1bb5ae036984e729ef9053058e00b0f8dd5e8e9c 05-May-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
Fix build
Merge commit '72a3740' into alee_merge
Merge commit 'ec1be30' into alee_merge
Merge commit '52c1beb' into alee_merge
Merge commit '94de93e' into alee_merge
Merge commit '8c162d4' into alee_merge
aaf0e8d623b1e94004557573aef9235177ca19e3 16-Apr-2015 Amit Mahajan <amitmahajan@google.com> Adding bearer_bitmask support.

Change-Id: I4da0bdd6de16963a60218789154da17f40fec8cd
om/android/internal/telephony/ApnSettingTest.java
94de93efcd4d4b879c14c443f7dfaabb5a9ce4a9 03-Apr-2015 Cheuksan Wang <edwang@google.com> add injectSmsPdu with subId to ISms.aidl

also clean up unused methods from ISms.aidl and UiccSmsController.java

BUG: 20015121
Change-Id: Ibd746ded4ac50c004cc7e5e2f629f53e919dfe2d
om/android/internal/telephony/SimSmsTest.java
3ce96a061c2c6e24f4ff3bd237e18c29fc0c0108 19-Feb-2015 Amit Mahajan <amitmahajan@google.com> Adding a new param to calculateLength for SMS to indicate if called for a
segment of multipart msg.

Encoding type is calculated separately for entire msg vs individual
segments. Change is to avoid overwriting the calculated value for
individual segment based.

Bug: 19399335
Change-Id: I8e89b7596e9c7440ace0486eceb1252094c373fa
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
6ad88a8a2caf739e78c8d5f7f50fc7fa84a07ca7 24-Sep-2013 Chaitanya Saggurthi <csaggurt@codeaurora.org> Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE

1) New commandinterface API sendSMSExpectMore to send sms using
ril request RIL_REQUEST_SEND_SMS_EXPECT_MORE.
2) sendSMSExpectMore API to send multisegment sms pdu's except
last pdu in GSM. In case of retry use sendSms even for
multi segment message, because don't know how many
segments are failed to send

Bug: 17570854
Change-Id: Icfc200a9c9c5940f0e10668b4385d1633a6c943b
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
3262c21feb1eede2917450cfdfd3faa86ee70cab 25-Aug-2014 Shishir Agrawal <shishir@google.com> Allow MVNO tethering APNS through gservices flags.

The change allows multiple APNs to be specified in
Settings.Global.TETHER_DUN_APN. It also adds mvnoType, and mvnoMatchData
support to the ApnSetting class.

Bug: 12977533

Change-Id: I424fc405c1e6270bf55eadb130ed839d50575cf1
om/android/internal/telephony/ApnSettingTest.java
9d4ec7d45061f1da05f16cd244eb0a798e7f36bb 13-Aug-2014 Amit Mahajan <amitmahajan@google.com> Revert "Revert "add apn setting parameters, and set apn parameters to bp""

This reverts commit 01f27d2c616797e5ba821159f8aca7b75aa54ae1.

Change-Id: Id9e7cf180092f320f635084f805b97f6409d0f03
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
01f27d2c616797e5ba821159f8aca7b75aa54ae1 12-Aug-2014 Amit Mahajan <amitmahajan@google.com> Revert "add apn setting parameters, and set apn parameters to bp"

This reverts commit f4b74430a8c22ab58c3fbbd6c9e7a594514a8615.

Change-Id: I1f300741d858ff39ae573e576479613b084e4616
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
f4b74430a8c22ab58c3fbbd6c9e7a594514a8615 10-Aug-2014 Hui Wang <huiwang@motorola.com> add apn setting parameters, and set apn parameters to bp

Change-Id: I395b499eb0730894620614b3261bb6a784d53f46
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
a8467dd0c524787104b1ccdddc5e8af10ba729ed 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
om/android/internal/telephony/gsm/GSMPhoneTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
f4016c89cdb71c75b63b73a9f6d5b84681307142 06-Feb-2014 Jake Hamby <jhamby@google.com> Remove unneeded new RIL command.

Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also, space out the NV item enum values so we can add new items per category.

Bug: 12864208
Change-Id: I1201c92198a8cd7e169efe7055b58259d975309b
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
f28ac81ec36df38307648d404cff4b2b11f46861 15-Jan-2014 Jake Hamby <jhamby@google.com> Add new RIL commands to read/write and reset NV items.

Add new RIL commands to read/write and reset NV items.
Used by some operators for CDMA band config and PRL update.

Note that this CL depends on a typo fix in the corresponding
frameworks/base change and packages/services/Telephony depends
on a typo fix in this CL.

Bug: 12864208
Change-Id: I3081619a82af698a3197ce23870bf4de248fb3e7
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
dc0a7a65c806fd58baa5e189227f1d302d51c0a6 05-Dec-2013 John Huang <jsh@android.com> am 9e6a8351: Merge "RIL changes for supporting generic SIM communication."

* commit '9e6a8351f1ee21e7dd7d30583c7085fcbeb3a863':
RIL changes for supporting generic SIM communication.
40d1d394302d83eb56f66cf08daecc612c97cd28 28-Nov-2013 Shishir Agrawal <shishir@google.com> RIL changes for supporting generic SIM communication.

Exposes four new commands through RIL.java:
- RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
- RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
- RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
- RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)

Change-Id: Iee4d950d37a6097493cd945e611c914c40827215
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
ace9a749c5a2a5e07527f728b7331423d16c36cd 30-Oct-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> SMS over IMS bug fixes

This change includes the following:
1) SMS over IMS remaining patches which address review comments

2) Fix for Bug:11378993
For MT SMS over IMS, if an application uses the createFromPdu(byte[] pdu) API
instead of createFromPdu(byte[] pdu,String format) API, we first try to create
SmsMessage from raw PDU with the format of active phone. That either returns a
valid SmsMessage object or throws a RuntimeException causing the correct format
to be used the next time. If GsmSmsAddress is not valid, we should throw
a RuntimeException which is handled by createFromPdu(byte[] pdu)

3) Fix for Bug:11424054
Register for ICC changes and handle new SMS on ICC

Bug: 11378993, 11424054
Change-Id: I94bcfcf93d8205c2916997091617899c6ebdd5e5
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
1260f1c6c909f2940989b72afe1b91fd83845eaa 14-Sep-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> Support SMS over IMS

ImsSMSDispatcher is part of IccSmsInterfaceManager.
It always receives calls to send sms first and decides
whether to use ims call flow or gsm/cdma based on response
to REQUEST_IMS_REGISTRATION_STATE.

When ims is registered and sms is supported, the request also returns
sms format to use.

In case of sms over ims failure, RIL_REQUEST_IMS_SEND_SMS sets
messageRef from RIL_SMS_RESPONSE of corresponding failed MO SMS, and
sets retry field to non-zero. If voice is available, sends
RIL_REQUEST_IMS_SEND_SMS retries with data encoded based on voice tech
available. If voice is not available, sets retry counter to max and
skips retries and sends failure to client.

Bug: 9626411

Change-Id: I4c63c8fc0eb2191847b509e66772e3de27d491ed
Signed-off-by: Ed Tam <etam@google.com>

Conflicts:
src/java/com/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
7667e7abe11b94b5573b565e25adbffdf7d65141 11-Apr-2013 Jake Hamby <jhamby@google.com> Fix some frameworks-telephony test compile errors.

Fix some frameworks-telephony test case compile errors due to
package name change for ApnSetting and additional methods added
to BaseCommands.

Change-Id: I72a9caabd6b7d09e9d0f1e39ab7bd24fa0e60594
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
4e9ed0410d72180872d59b14cb375c1c2ed94788 26-Mar-2013 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 4eede890 to jb-mr2-dev

Change-Id: I7ee1d93d832275ad04d4e6bbae68d22ae86322ac
01fdbd3285be1a8ba2143a4bc11a0f5065bb68d0 10-May-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Fix IntRangeManager

-Fix to populate SmsBroadcastConfigInfo list with all the possible
range lists upon enable and disable to match previous implementation.
-Fix ClientRange to be ordered by start id, then by end id.
-Fix enableRange to handle missing cases:
-enable exact same range, i.e. new [x, y], existing [x, y]
-enable range that is already enclosed in existing range i.e.
adding [3, 3] to existing range [1,3]
-enable (startId -1) == range.endId, i.e. new [3, y] existing [1, 2]
-Fix where range.endId is not updated correctly
-Fix disableRange to first update mRange then call updateRange.
-Add more unit test cases.

Bug: 8355035
Change-Id: I83308c76ed28c6f753326aeaac6bec1d88c01b39
om/android/internal/telephony/IntRangeManagerTest.java
22d85a8e3a575a6d01d2c788587971657dfe20c6 23-Feb-2013 Wink Saville <wink@google.com> Clean up member variables.

Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
91187d41b202273075a302a4fd4f8df719b5dee0 09-Feb-2013 Jake Hamby <jhamby@google.com> Fix test case broken by change to ISms method signature.

A recent change to move ISms.aidl from frameworks/opt/telephony to
frameworks/base caused this test case not to compile. Fixed the caller
to add the new argument containing the package name of the caller.

Bug: 8107987
Change-Id: I2b1acefbfe0588a940a506f891077b00fa026d2d
om/android/internal/telephony/SimSmsTest.java
48a57c9ac6516c0f34a9593d6ffd64173fdf6953 10-Jan-2013 Jake Hamby <jhamby@google.com> Add frameworks-telephony test cases for CDMA SMS.

Add test cases to verify support for Shift-JIS encoding/decoding
for CDMA SMS BearerData. Also test whether reserved bearer data
subparameters are properly skipped.

$ runtest -c com.android.internal.telephony.cdma.sms.CdmaSmsTest \
frameworks-telephony

The original version of this patch did not merge from AOSP to the
internal tree because of changes to mock RIL files that have been
removed. This patch contains only the change to CdmaSmsTest.java.

Change-Id: Ib51d99c73c636467b970327e5c6af2d6a289c651
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
6387253f9b0eb8bec049115498ec1f2bfd6d991d 05-Feb-2013 Jake Hamby <jhamby@google.com> am 9eef81ce: am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '9eef81ce80e72d68a8349fd84797276cb9cbe957':
Telephony: Define enable/disable APIs for Cdma CMAS
895586961de9992a4feefc57b648e01d158a382c 04-Feb-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
a63f55cf17629426d976830429a7612387532195 24-Jul-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Define enable/disable APIs for Cdma CMAS

- Define enableCellBroadcastRange, disableCellBroadcastRange,
enableCellBroadcast, disableCellBroadcast for Cdma broadcast.
Create CdmaBroadcastRangeManager extended from existing IntRangeManager.

Change-Id: I5d70175862547475f49e08328ab3dcc5560e9096
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
79555c93820b5159b25c01fff47d16fe623ce866 31-Jan-2013 Wink Saville <wink@google.com> Fix some broken tests.

Change-Id: I10d48c6597bb0c45d70a6a2d77a0afb9d295568d
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/Wap230WspContentTypeTest.java
babd5ede15dfced63fc5bf5a522634fd85e3e0f1 31-Jan-2013 Wink Saville <wink@google.com> am 6943a913: am 5dcd8d72: Merge "Fix failed test case when running framework auto test."

# By xiaohui wang
# Via Android Git Automerger (1) and others
* commit '6943a913f8bb044f40f94a933c1e2b24e103f59a':
Fix failed test case when running framework auto test.
0577de49f739f113f6e07d5539defc8d48232282 30-Jan-2013 xiaohui wang <xiaohui.wang@sonymobile.com> Fix failed test case when running framework auto test.

The method RetryManager.setRetryCount was modified in
f186b07b463447707117e2b54fc02f7ed30d6e43, However the
corresponding test cases were not updated and now fail.

The reason for failing is that setRetryCount no longer resets
the variable mRetryForever as it used to, and therefore
isRetryNeeded() returns true instead of false failing the
testcases.

Change-Id: Icbf23ada8000fab93ee34087e125d9b12d7e7897
om/android/internal/telephony/TelephonyUtilsTest.java
60dc9dc311361f9fb52155ea28d383d55afa90d8 11-Dec-2012 Wink Saville <wink@google.com> Merge commit '7e4b734a' into fix-merge-conflict

* commit '7e4b734a':
Telephony: Move uicc classes into uicc package

Change-Id: Iacc7f1805500bfe55299aaedbe0241ebba8e8b23
d720945f2be5ea5fe0faf67e67d9ea0e184eba67 01-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Move uicc classes into uicc package

Reduce constructor visibility to package where
possible

Dependent Changes:
I3b718b9aea1f21c7906c8243b4ca0db6af495a08
I80204a2f3dc57cac875abeab390bb9db7a636ff7
Ib9c19e8b157dc7ec74eb14baca5bd3b5caf08c47

Change-Id: Ib4f43374c041cb5eaf2e3883e5ea28b2eb2c9a69
om/android/internal/telephony/AdnRecordTest.java
om/android/internal/telephony/GsmAlphabetTest.java
om/android/internal/telephony/IccServiceTableTest.java
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SimPhoneBookTest.java
om/android/internal/telephony/SimUtilsTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimServiceTableTest.java
ded9c0af7fa49504c047275ed34c2d3b22bf0c3a 07-Dec-2012 Wink Saville <wink@google.com> Use Rlog

Change-Id: Ie013f51215de8380b8de74161b6056b010711cfd
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/mockril/MockRilTest.java
99c2e1d6749cfad2a8ca94a47857d8c3bfc09454 27-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log.

Change-Id: I2f44193b294513e743526e5c163e7d9a45308b28
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
d008821aacac55a7d4717fb52b85ab5590be30eb 17-Nov-2012 Wink Saville <wink@google.com> Remove mockril.

Mock ril isn't being used and the V8 library is being removed,
so mockril is being removed.

Change-Id: I76238bd97ff82072786e05a275bd90102c02f391
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/mockril/MockRilTest.java
ac1701bae6a076fe92b05875aa94b6bef45838c1 31-Aug-2012 Jake Hamby <jhamby@google.com> am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.

* commit '115632cc56f813bd21543f8532c763d7d2968046':
Fix CDMA decoding of multipart UTF-16 SMS messages.
115632cc56f813bd21543f8532c763d7d2968046 31-Aug-2012 Jake Hamby <jhamby@google.com> Fix CDMA decoding of multipart UTF-16 SMS messages.

Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: I4000fa2f4703b39e5ed7e5bd8490828303ef8979
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
7f7d82aac56022880f613772ed4a90738075c843 31-Aug-2012 Wink Saville <wink@google.com> am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit '50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5':
WspTypeDecoder: fixed decoding of content parameters
50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5 31-Aug-2012 Wink Saville <wink@google.com> am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit 'cc0e54506132e42f5e0ca2cfee0c399ba49ba149':
WspTypeDecoder: fixed decoding of content parameters
0fcf2097e7e217319b625d5dfc24aded06c02227 30-Aug-2012 Johan Redestig <johan.redestig@sonymobile.com> WspTypeDecoder: fixed decoding of content parameters

The removed condition prevented any parameter to have
0 as integer value.

Change-Id: Iaa8e106e49a51322c07f647f2f66bb7bd6055c89
om/android/internal/telephony/Wap230WspContentTypeTest.java
a6b55dcb21ebc8e781d3031ff2de74e23427abb1 26-Jul-2012 Jake Hamby <jhamby@google.com> am 324dd8d1: am b8a13d30: Implement CMAS service category program results.

* commit '324dd8d12e3c3df713e981119d8e88c6afefa962':
Implement CMAS service category program results.
b8a13d300b245e0080aa01275e232f54d5d0e09c 25-Jul-2012 Jake Hamby <jhamby@google.com> Implement CMAS service category program results.

Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
3c93767bab0040818e0f530c0d0102654a87e0c0 25-Jul-2012 Wink Saville <wink@google.com> Merge "Revise CellInfo API's"
dbbcde988d620307a97afbd9a6dc389eab02b586 18-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests

This test was missed out while migrating telephony code from frameworks/base.

Change-Id: Id3a2add255057b8b977e48a4fa873b44c3ddc732
om/android/internal/telephony/SmsUsageMonitorShortCodeTest.java
ef1d4bff9bbf7d967dbcace73f08910e14e367d0 17-Jul-2012 Wink Saville <wink@google.com> Revise CellInfo API's

Change-Id: I35bc22caf4a6a2255f2ce122690823f8d602b359
om/android/internal/telephony/TestPhoneNotifier.java
c38bb60d867c5d61d90b7179a9ed2b2d1848124f 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common - DO NOT MERGE

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/ATResponseParserTest.java
om/android/internal/telephony/AdnRecordTest.java
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/GsmAlphabetTest.java
om/android/internal/telephony/GsmSmsTest.java
om/android/internal/telephony/IccServiceTableTest.java
om/android/internal/telephony/IntRangeManagerTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/NeighboringCellInfoTest.java
om/android/internal/telephony/PhoneNumberUtilsTest.java
om/android/internal/telephony/PhoneNumberWatcherTest.java
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SimPhoneBookTest.java
om/android/internal/telephony/SimSmsTest.java
om/android/internal/telephony/SimUtilsTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestPhoneNotifier.java
om/android/internal/telephony/Wap230WspContentTypeTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
om/android/internal/telephony/gsm/GSMPhoneTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/gsm/UsimServiceTableTest.java
om/android/internal/telephony/mockril/MockRilTest.java
0825495a331bb44df395a0cdb79fab85e68db5d5 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
om/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
om/android/internal/telephony/ATResponseParserTest.java
om/android/internal/telephony/AdnRecordTest.java
om/android/internal/telephony/ApnSettingTest.java
om/android/internal/telephony/CallerInfoTest.java
om/android/internal/telephony/GsmAlphabetTest.java
om/android/internal/telephony/GsmSmsTest.java
om/android/internal/telephony/IccServiceTableTest.java
om/android/internal/telephony/IntRangeManagerTest.java
om/android/internal/telephony/MccTableTest.java
om/android/internal/telephony/NeighboringCellInfoTest.java
om/android/internal/telephony/PhoneNumberUtilsTest.java
om/android/internal/telephony/PhoneNumberWatcherTest.java
om/android/internal/telephony/SMSDispatcherTest.java
om/android/internal/telephony/SimPhoneBookTest.java
om/android/internal/telephony/SimSmsTest.java
om/android/internal/telephony/SimUtilsTest.java
om/android/internal/telephony/SmsMessageBodyTest.java
om/android/internal/telephony/TelephonyUtilsTest.java
om/android/internal/telephony/TestPhoneNotifier.java
om/android/internal/telephony/Wap230WspContentTypeTest.java
om/android/internal/telephony/cdma/CdmaSmsCbTest.java
om/android/internal/telephony/cdma/sms/CdmaSmsTest.java
om/android/internal/telephony/gsm/GSMPhoneTest.java
om/android/internal/telephony/gsm/GSMTestHandler.java
om/android/internal/telephony/gsm/GsmSmsCbTest.java
om/android/internal/telephony/gsm/UsimDataDownloadCommands.java
om/android/internal/telephony/gsm/UsimDataDownloadTest.java
om/android/internal/telephony/gsm/UsimServiceTableTest.java
om/android/internal/telephony/mockril/MockRilTest.java