Commit Graph

3891 Commits

Author SHA1 Message Date
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
Nathan Harold
fb6daf7cf7 Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE
There is still confusion about the scope of the
KEY_CARRIER_NAME_OVERRIDE. This CL further clarifies
that the carrier, for purposes of this string, is the
service provider. Thus, the CARRIER_NAME_OVERRIDE will
still be subject to SPN display rules.

Note: to use this override in scenarios such as roaming
where the display rules may not choose the name of the
home operator (and thus not choose this override), a
service provider may choose to use other flags such as
KEY_FORCE_HOME_NETWORK_BOOL and
KEY_SPN_DISPLAY_RULE_USE_ROAMING_FROM_SERVICE_STATE_BOOL
to achieve the desired display behavior.

Bug: 77461054
Test: none (docstring-only change)
Merged-In: Id866df7ef9ce593de1f9d31d2556af4bfc766a8e
Change-Id: Id866df7ef9ce593de1f9d31d2556af4bfc766a8e
(cherry picked from commit 178020a2f8)
2018-04-16 13:53:50 -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
fionaxu
4801a078cd Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug: 77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
(cherry picked from commit 272e8cf87e)
Merged-in: 272e8cf87e
2018-04-11 18:10:12 -07:00
Chen Xu
1be0392273 Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev 2018-04-12 01:02:21 +00:00
Jeff Sharkey
dcc615a028 Merge "APIs to disable data usage notifications." into pi-dev am: f0b9fbebc0
am: 568a972669

Change-Id: I8bfcf47c10e5f43f963fe012e98d0afd83630e64
2018-04-11 16:51:25 -07:00
Jeff Sharkey
568a972669 Merge "APIs to disable data usage notifications." into pi-dev
am: f0b9fbebc0

Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
2018-04-11 16:14:26 -07:00
TreeHugger Robot
f0b9fbebc0 Merge "APIs to disable data usage notifications." into pi-dev 2018-04-11 23:05:03 +00:00
Jeff Sharkey
0a5570d49d APIs to disable data usage notifications.
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis.  (The notifications are still
enabled by default.)

Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().

Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active.  Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.

Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
2018-04-11 22:07:40 +00:00
fionaxu
272e8cf87e Change getGroupIdLevel1() to use subId from TelephonyManager Instance
Bug: 77905912
Test: Build
Change-Id: I720971ce115147b994e27611a0dcf052989180ec
2018-04-11 21:26:48 +00:00
Hall Liu
2df7623295 Merge "Make setServiceId a TestApi" into pi-dev am: d41e669fca
am: 035b4827ca

Change-Id: I7ab128fb3bf6e09c1e19d43b164acea52949c2ac
2018-04-11 13:58:36 -07:00
Brad Ebinger
13ac0a15e1 Update Docs to clarify using a Message across IPC
When using Message across IPC, the message must be sent
with a Messenger. Update Docs to reflect this.

Bug: 77870347
Test: Telephony Unit Tests
Change-Id: I27977a13f7ccb6875b5fdb7eb6c6836a84166eeb
2018-04-11 13:46:59 -07:00
Hall Liu
035b4827ca Merge "Make setServiceId a TestApi" into pi-dev
am: d41e669fca

Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb
2018-04-11 13:30:18 -07:00
Hall Liu
d41e669fca Merge "Make setServiceId a TestApi" into pi-dev 2018-04-11 20:21:48 +00:00
Jeff Sharkey
3990ee1c9f Clean up APIs before declaring API 28.
As part of finalizing an SDK, we need to ensure that no new APIs are
marked @Deprecated, since they're typically cleanup that someone
forgot to finish.

Someone forgot to replace Slice.getTimestamp() with Slice.getLong().

Bug: 77588754
Test: builds, boots
Exempt-From-Owner-Approval: SDK finalization
Change-Id: Ic0ec91a43d161a69c1e840c42046ad500b7aeca0
2018-04-11 13:49:21 -06:00
Jack Yu
ea440a765e Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev
am: 10fb6582eb

Change-Id: Ica3ee854446d0a2f0b596d2c7bc6381ebf963584
2018-04-11 12:29:29 -07:00
TreeHugger Robot
10fb6582eb Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev 2018-04-11 18:36:31 +00:00
Jack Yu
a7025bae0a DO NOT MERGE - Hide IWLAN system API
Hide IWLAN system API for P. Will expose those APIs when IWLAN
full mode support is in place.

Test: Telephony sanity tests
Bug: 64132030
Change-Id: Ic56a04538fc532a7326c8a9234182899d52f15c1
2018-04-10 17:15:31 -07:00
Jordan Liu
82e9122c7a Merge "Update getIccAuthentication documentation" into pi-dev am: ae4518c736
am: 1422ec907e

Change-Id: I08ba6926d9eddc4cc26562281f19d0be0cf3b82e
2018-04-10 16:04:11 -07:00
Jordan Liu
1422ec907e Merge "Update getIccAuthentication documentation" into pi-dev
am: ae4518c736

Change-Id: I4f06b912bf68a5dea611cb12ebcffd71a8fae7e8
2018-04-10 15:37:08 -07:00
Hall Liu
07f1843e28 Make setServiceId a TestApi
Bug: 77152869
Test: CTS
Change-Id: I26f60b48865953971de02c50db48e0ff66f4e2a0
2018-04-10 21:11:27 +00:00