Commit Graph

3709 Commits

Author SHA1 Message Date
Jack Yu
3ebda73095 Merge "Set country code even when device is not registered on network" 2018-04-22 19:21:02 +00:00
Jack Yu
ac36896f1a Set country code even when device is not registered on network
Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Change-Id: Ia32cbc9df9b9adf5d7c24c8b90be20063a94a514
2018-04-22 01:05:44 -07:00
Jack Yu
dc7701634d Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev am: 8f6568f908
am: 30a65dfb4a

Change-Id: I1b182574b5897e92b43819fb55ff9de0a2bc2f13
2018-04-21 10:42:00 -07:00
Jack Yu
30a65dfb4a Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev
am: 8f6568f908

Change-Id: I1ab715aa93609d653b689ef3570135d03c669cdf
2018-04-21 10:30:58 -07:00
Jack Yu
8f6568f908 Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev 2018-04-21 17:18:52 +00:00
Jack Yu
41f3a622e1 Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev
am: 4755c56965

Change-Id: I0602070b32e29a044ea24e08ad5ced6bc23cb795
2018-04-20 18:37:36 -07:00
Jack Yu
4755c56965 Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev 2018-04-21 01:22:51 +00:00
Jack Yu
1e9793f926 Fixed CTS CtsUsageStatsTestCases test cases
We used the current RAT to load different carrier configuration to
determine whether the connection of a certain APN type is metered or
not. When the device is switched to IWLAN, the existing default
APN connection on cellular will be marked as unmetered based on
the current logic. This logic will be refactored when IWLAN full mode
is supported in Q.

For the short term workaround for P, we'll just mark default APN as
metered when the device is on IWLAN.

Test: CtsUsageStatsTestCases
Bug: 74540336, 77504652
Change-Id: Ib098e80d2bfd10e74c0b0dacf2cf2f217a66f7e4
2018-04-20 16:55:25 -07:00
Jack Yu
65ee3064df DO NOT MERGE - Set country code even when device is not registered on network
Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Change-Id: Ic7c9e903cc497b7e43b557cb593407ff3e9305b5
2018-04-20 16:36:43 -07:00
Malcolm Chen
2a466b1ae0 Merge "Add carrier config for partial sms raw message expiration." into pi-dev am: 3d0ff90649
am: 213dfef6c2

Change-Id: I621f79c2495a4ef176b0754da875353b19f9edf5
2018-04-18 14:17:26 -07:00
Malcolm Chen
213dfef6c2 Merge "Add carrier config for partial sms raw message expiration." into pi-dev
am: 3d0ff90649

Change-Id: I2b9d6d58ab96264bbfac72ccde37fdf841b17373
2018-04-18 13:27:46 -07:00
TreeHugger Robot
3d0ff90649 Merge "Add carrier config for partial sms raw message expiration." into pi-dev 2018-04-18 20:15:16 +00:00
Shuo Qian
e116dcc57c Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev 2018-04-18 17:50:31 +00:00
Cassie
fa7a3bbe83 Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev am: 27cd1f7e20
am: 59cad0052d

Change-Id: If5046509aed94fb6f006644f52e6446fd96fbf74
2018-04-18 10:23:53 -07:00
Cassie
59cad0052d Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev
am: 27cd1f7e20

Change-Id: I66eebeab2f4a3c3029a437fc1bd717cc745c6051
2018-04-18 10:05:44 -07:00
TreeHugger Robot
27cd1f7e20 Merge "Fix a tiny bug in NetworkScanRequest" into pi-dev 2018-04-18 16:52:34 +00:00
Shuo Qian
1c783aed8a Merge "Revert "Remove the OEM hook implementation and usage"" am: e7a099149f am: 1b5c97ced4
am: 5a2d94e93b

Change-Id: I161968fdc2ab81b1ed0b36a9c1b90290680dbed8
2018-04-18 02:27:27 -07:00
Shuo Qian
5a2d94e93b Merge "Revert "Remove the OEM hook implementation and usage"" am: e7a099149f
am: 1b5c97ced4

Change-Id: I5b86e206dd777c331d2a28c74472c328e2cc55f9
2018-04-18 02:20:21 -07:00
sqian
7cfc5cda2f Revert "Remove the OEM hook implementation and usage"
This reverts commit 2635a89c8c.

Bug: 34344851
Test: Treehugger
Change-Id: I96697165fd75054de42f007c16ca294ed6725708
Merged-In: I96697165fd75054de42f007c16ca294ed6725708
(cherry picked from commit 00b89515a5)
2018-04-17 18:46:46 -07:00
sqian
00b89515a5 Revert "Remove the OEM hook implementation and usage"
This reverts commit 2635a89c8c.

Bug: 34344851
Change-Id: I96697165fd75054de42f007c16ca294ed6725708
2018-04-17 11:55:30 -07:00
Cassie
5f460b6837 Fix a tiny bug in NetworkScanRequest
Bug: 77487847
Test: cts-tradefed run cts -m CtsCarrierApiTestCases --test android.carrierapi.cts.NetworkScanApiTest
Change-Id: Ic4b167cf4929a1bb86fa7e6768672a9288b96911
2018-04-17 09:20:08 -07:00
Malcolm Chen
21d1f68d81 Merge "Fix UiccSlotInfo equals method." into pi-dev am: 82c0b73e98
am: e8fdd3b279

Change-Id: I0dc9ec7f55672e258ebef04e2705f23f8b9b67a0
2018-04-16 18:35:56 -07:00
Malcolm Chen
e8fdd3b279 Merge "Fix UiccSlotInfo equals method." into pi-dev
am: 82c0b73e98

Change-Id: Ide54ab7f3b29b7bde846aa292f121bef0baa13cb
2018-04-16 17:39:13 -07:00
TreeHugger Robot
82c0b73e98 Merge "Fix UiccSlotInfo equals method." into pi-dev 2018-04-16 23:56:06 +00:00
Malcolm Chen
b56234fc9b Add carrier config for partial sms raw message expiration.
Everytime at boot-up, we check Sms raw table, and delete the rows
with any partial message that is too old. By default the expiration
age is 30 days, but we want to make it configurable.

Bug: 77910620
Test: sanity-test
Change-Id: Ibd2374324be5513cbd09c04889e7b96051c26fb4
2018-04-16 15:20:38 -07:00
Jiuyu Sun
8e47984ec8 Merge "Fix typos." into pi-dev am: 2135c52b4d
am: 99852e4a14

Change-Id: I7336864d584885ef14c5995e83192ac5b0e481d1
2018-04-16 14:48:33 -07:00
Jiuyu Sun
99852e4a14 Merge "Fix typos." into pi-dev
am: 2135c52b4d

Change-Id: I2f700355d8f4476a875e4b95df17e7441b0332b4
2018-04-16 14:20:02 -07:00
Jiuyu Sun
2135c52b4d Merge "Fix typos." into pi-dev 2018-04-16 20:48:52 +00:00
Malcolm Chen
5ea8ba5c0c Fix UiccSlotInfo equals method.
In UiccSlotInfo#equals method, it's comparing Strings incorrectly.

Bug: 78033760
Test: GTS test
Change-Id: I4fed0a70ee0ef06bcf7a1af544e6aebced31d9c2
2018-04-16 12:50:13 -07:00
Brad Ebinger
b22fdaa678 Merge "Update Docs to clarify using a Message across IPC" into pi-dev am: 4558c77d5d
am: 7419a7fb4c

Change-Id: I944177474489f7c0122f5a26cf58f59561762885
2018-04-14 18:12:20 -07:00
Brad Ebinger
d8a66c98e0 Merge "Adds a private field to parceled data." into pi-dev am: 63a6bc6794
am: 5e5e0760de

Change-Id: I1fd79faf4e7a584cdb518e9fa05e98b5870eb2ab
2018-04-14 18:07:13 -07:00
Brad Ebinger
7419a7fb4c Merge "Update Docs to clarify using a Message across IPC" into pi-dev
am: 4558c77d5d

Change-Id: Ie1a0be63d26136f14cd30c354b889ec0311cc7ee
2018-04-14 17:29:07 -07:00
Brad Ebinger
5e5e0760de Merge "Adds a private field to parceled data." into pi-dev
am: 63a6bc6794

Change-Id: Ib87a7af0654cc1ec0db052d8ee72f4c74c0aea04
2018-04-14 17:25:44 -07:00
Brad Ebinger
4558c77d5d Merge "Update Docs to clarify using a Message across IPC" into pi-dev 2018-04-13 21:35:13 +00:00
Brad Ebinger
63a6bc6794 Merge "Adds a private field to parceled data." into pi-dev 2018-04-13 21:34:37 +00:00
Nathan Harold
9bd8491015 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev am: ade0186795
am: b954b207d0

Change-Id: I565bcf163a1f23498781a0d8c23d3e4f619449ce
2018-04-12 18:12:41 -07:00
Jeff Sharkey
d2a25e66e0 Merge "Remove poorly defined notification APIs." into pi-dev am: 36efb71088
am: d6e49befda

Change-Id: I6689556635b2ee8e56aca7325596e32efdc7311b
2018-04-12 17:23:57 -07:00
Nathan Harold
b954b207d0 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev
am: ade0186795

Change-Id: I94821c8390473ea96c2c8f9a674e736587807477
2018-04-12 16:36:10 -07:00
Jeff Sharkey
d6e49befda Merge "Remove poorly defined notification APIs." into pi-dev
am: 36efb71088

Change-Id: I45a479a7baeaea642e3ceaef1448b0527b37bb34
2018-04-12 16:01:35 -07:00
TreeHugger Robot
ade0186795 Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev 2018-04-12 22:34:16 +00:00
fionaxu
780b62b3b5 A test api to override carrier information
This API should only be used for testing purpose e.g., CTS/GTS/SL4A
By overriding carrier information, we could force a particular carrier id,
carrier's config, but also any country or carrier overlays to be loaded
when using a test SIM with a call box.

Bug: 72332597
Test: atest CtsTelephonyTestCases:CarrierIdentificationTest

Change-Id: Icd5804375ef9334c9f6c382cc6a774b9c9c15213
(cherry picked from commit 5b509b81a0)
Merged-in: 5b509b81a0
2018-04-12 22:19:15 +00:00
Hall Liu
bd6bf7cbe8 Merge "Make setServiceId a TestApi" 2018-04-12 20:41:44 +00:00
Jeff Sharkey
1df7ee5757 Remove poorly defined notification APIs.
They were rushed in at the last second, and feedback from stakeholders
reveals they're not ready for prime time.

Bug: 77851691
Test: builds, boots
Exempt-From-Owner-Approval: SDK finalization
Change-Id: I96f6c80610627878a29543b345419924774a60e0
2018-04-12 18:27:08 +00:00
Brad Ebinger
af6a410792 Adds a private field to parceled data.
Bug: 77957465
Test: Manual/GTS
Change-Id: I321b667f9186feaf2579bd4dd27ebf67fc2e0d52
2018-04-12 16:16:30 +00:00
Wale Ogunwale
cbb04c868d Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa
am: b129fadef8

Change-Id: I9b8414b89138651f3b3132789cae59ad6780dbb6
2018-04-12 05:45:08 -07:00
Wale Ogunwale
b129fadef8 Merge "Clean up APIs before declaring API 28." into pi-dev
am: fb10508cfa

Change-Id: Ic20ef429dbae1c9c5702094e1203838517b3ec38
2018-04-12 05:33:09 -07:00
Wale Ogunwale
fb10508cfa Merge "Clean up APIs before declaring API 28." into pi-dev 2018-04-12 12:19:56 +00:00
Chen Xu
26990f7bfc Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev am: 1be0392273
am: 5327a38956

Change-Id: I17bf7649f1bf09873064937f5d81f9910aeffcac
2018-04-11 18:50:58 -07:00
Chen Xu
5327a38956 Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev
am: 1be0392273

Change-Id: I89b46de2f70ca8a33eb57bc3ddf7c4a8c41d1034
2018-04-11 18:30:01 -07:00
Hall Liu
beb880f724 Make setServiceId a TestApi
Bug: 77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
Merged-In: I26f60b48865953971de02c50db48e0ff66f4e2a0
2018-04-11 18:23:30 -07:00