Commit Graph

4328 Commits

Author SHA1 Message Date
Jeff Sharkey
f89879a133 Merge "Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class." into oc-dev
am: 080e16575a

Change-Id: I8e81a2f5361d2fc6ab61cb38f69fe1e0eb867e63
2017-05-01 16:11:00 +00:00
Hall Liu
5184e5ded2 Merge "eMBMS API update" am: 99b21ccb34 am: 6b4841d116
am: cfb792830c

Change-Id: I4d227eeae02910f4be020b3e9abf3ec5decc168d
2017-04-28 22:38:27 +00:00
Hall Liu
6b4841d116 Merge "eMBMS API update"
am: 99b21ccb34

Change-Id: Ic459910f1a06979cf8e1813d18400236eeb1ad49
2017-04-28 22:25:53 +00:00
Hall Liu
99b21ccb34 Merge "eMBMS API update" 2017-04-28 22:17:54 +00:00
fionaxu
6512f5eb10 Merge "better defualt behaviour for msim"
am: fd810d8727

Change-Id: I242527153b768879acd1c105e69de5672678b006
2017-04-28 19:53:38 +00:00
Malcolm Chen
598d24c558 Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED,
ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX
from Intent class to SubscriptionManager class.

Bug: 37497166
Test: Manual
Change-Id: Ifeedf974328cd3d839d7f66bf41a91c479d66316
2017-04-28 11:27:10 -07:00
Chen Xu
85f2654bb7 Merge "Updated javadocs for sendUssd APIs."
am: 763ff42a69

Change-Id: I9a7fd10b652bdbc43b3a171229815f99dfbf8e97
2017-04-28 17:57:29 +00:00
Chen Xu
fe7e5970ac Merge "Update VVM API"
am: ac29d38623

Change-Id: Iec4b0f3cb89b49902aeeb7a044fbab0a98ba9e3e
2017-04-28 17:55:07 +00:00
fionaxu
377b804d16 better defualt behaviour for msim
switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.

Bug: 36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Merged-in: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
2017-04-28 10:43:17 -07:00
Chen Xu
763ff42a69 Merge "Updated javadocs for sendUssd APIs." 2017-04-28 17:26:13 +00:00
Chen Xu
ac29d38623 Merge "Update VVM API" 2017-04-28 17:25:54 +00:00
Hall Liu
563e150c2d eMBMS API update
Brings eMBMS APIs into alignment with the architecture doc.
All APIs are hidden for now.

Test: builds
Change-Id: I6e692bd363f998d1cd8f80faa72bde71ffe8fd2e
2017-04-27 19:43:11 -07:00
Ta-wei Yen
9a3dcc559e Update VVM API
+ TelephonyManager.getVisualVoicemailPackageName() uses pinned subId
  from the manager.
+ TelephonyManager.getNetworkSpecifier() updated doc to explain what
  a network specifier is.
+ TelephonyManager.getCarrierConfig() Annotated with @WorkerThread
  specified failure behavior.
+ VisualVoicemailSms.getFields() Doc specified values are carrier
  dependent.

- Hide DEFAULT_* from VisualVociemaliSmsFitelrSettings

Test: CTS TelephonyManagerTest
Bug: 35766748
Fixes: 35766370
Fixes: 35766489
Change-Id: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5
Merged-in: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5
2017-04-27 16:47:48 -07:00
fionaxu
e9f3f965c8 Merge "new reset carrier signals/actions" am: 5bd39aaf42 am: dc31a45517
am: 89b525afb3

Change-Id: Idcdfb7667b0db7b403bab38bcc24201a8eafe4ca
2017-04-27 23:12:12 +00:00
fionaxu
dc31a45517 Merge "new reset carrier signals/actions"
am: 5bd39aaf42

Change-Id: I503cd2c7d7ca63d9668995319d4876a39fc91666
2017-04-27 22:57:30 +00:00
TreeHugger Robot
b71f3ca3f0 Merge "new reset carrier signals/actions" into oc-dev 2017-04-27 21:35:47 +00:00
fionaxu
77f466d8f6 new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Merged-in: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
2017-04-27 14:09:57 -07:00
pkanwar
3ffa1ff874 Updated javadocs for sendUssd APIs.
Bug: 35766546
Change-Id: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Merged-in: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Test: manual
2017-04-27 13:49:29 -07:00
pkanwar
1eedb9c214 resolve merge conflicts of 8814befacd to oc-dev-plus-aosp
Test: manual
BUG: 35606429
Change-Id: I0e9c5edaaa3e0ddf7719ebbffd650b8bdd88faa1
2017-04-27 12:32:07 -07:00
Jeff Davidson
0b79745dd1 Merge "Rename getDataEnabled() to isDataEnabled()."
am: 4898b704de

Change-Id: Ic11d6568aac8cdad151c61fa32d4535ccea9f53b
2017-04-27 18:17:28 +00:00
fionaxu
982799eb08 new reset carrier signals/actions
- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
2017-04-27 11:07:54 -07:00
Jeff Davidson
4898b704de Merge "Rename getDataEnabled() to isDataEnabled()." 2017-04-27 18:03:33 +00:00
Chen Xu
2eae7bfc03 Merge "Add getVisualVoicemailPackageName()"
am: 998eb212bd

Change-Id: I482cd62e9f2330624e688b8d65aa9353500b1d79
2017-04-27 17:57:36 +00:00
Pankaj Kanwar
1dec74b78f Merge "RIL changes to allow the modem to query the framework for the key."
am: 0c83ef2c72

Change-Id: I8a326ac926e880d8095330638e54d56ad8c98485
2017-04-27 17:49:09 +00:00
Chen Xu
998eb212bd Merge "Add getVisualVoicemailPackageName()" 2017-04-27 17:46:04 +00:00
Pankaj Kanwar
0c83ef2c72 Merge "RIL changes to allow the modem to query the framework for the key." 2017-04-27 17:41:58 +00:00
Brad Ebinger
2a711c3c50 Merge "Better handle MSIM DDS changed event" am: 4418eb4ddf am: 8a3f025d71
am: 71f70d6685

Change-Id: I55cac364221c728ad1c77be783c358e8d98ec2b4
2017-04-27 17:03:20 +00:00
Brad Ebinger
8a3f025d71 Merge "Better handle MSIM DDS changed event"
am: 4418eb4ddf

Change-Id: Ibadbaec61808e571ebbd1c0c2ac90cf3c5141a57
2017-04-27 16:46:54 +00:00
Brad Ebinger
4418eb4ddf Merge "Better handle MSIM DDS changed event" 2017-04-27 16:38:48 +00:00
pkanwar
c66a5296b6 RIL changes to allow the modem to query the framework for the key.
In order to support IMSI encryption, the modem needs to request the
framework for the public key of the Carrier. The framework will pass
2 fields back, the public key and a string (which is a key value pair
to be defined by the carrier).

BUG: 35606429
Test: manual
Change-Id: I609e4505508aa6bb5b442c09eb4c346106492361
Merged-In: I609e4505508aa6bb5b442c09eb4c346106492361
2017-04-27 16:12:13 +00:00
Ta-wei Yen
5259d8c9ff Add getVisualVoicemailPackageName()
Make NMR2 voicemail columns public

getVisualVoicemailPackageName() and the IS_OMTP_VOICEMAIL is used by
the voicemail UI to filter out voicemails not from the current visual
voicemail app, for example legacy telephony voicemails or previous
default dialer. These voicmails all represent the same source and are
likely duplicates.

BACKED_UP and RESTORED are used by the system dialer voicemail back
up and restore feature in NMR2. Since there are no API bump, it was
hidden and made public in this CL instead. See ag/1803794

ARCHIVED is used to prevent locally saved voicemails from being
deleted during a sync because it does not exist on the server.

Bug: 34463609
Fixes: 34463609
Bug: 32414216
Test: cts test android.provider.cts.VoicemailContractTest
    android.telephony.cts.VisualVoicemailServiceTest

Change-Id: Iec1e499e763ad92f4a822715b6022e9cbe557c11
Merged-in: Iec1e499e763ad92f4a822715b6022e9cbe557c11
2017-04-26 14:03:30 -07:00
Jeff Davidson
9a7d6bb4b9 Rename getDataEnabled() to isDataEnabled().
The old API is reverted back to @SystemApi and marked deprecated to
avoid breaking any compilation.

Also clean up the Javadoc by making the permissions requirements
clearer and noting that this API does not take per-app data
restrictions into account.

Merged-In: I5baacc1fd7e75d54e1d6521c24f792f427d9e228
Change-Id: I5baacc1fd7e75d54e1d6521c24f792f427d9e228
Test: TreeHugger build/boot
Fixes: 35766530
2017-04-26 10:09:24 -07:00
Chen Xu
e701b7ab34 Merge "Extend carrier configs for visual voicemail"
am: f4db619b0b

Change-Id: I0ae8f81fde3ca866c6be897311243b6225341296
2017-04-26 16:51:22 +00:00
Chen Xu
f4db619b0b Merge "Extend carrier configs for visual voicemail" 2017-04-26 16:42:09 +00:00
Pankaj Kanwar
a086824e5a Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
am: 3a8ad81ab4

Change-Id: I54d5ac5a02b4bb0e0bd9d3f3eb2428613c40c1ec
2017-04-25 23:40:54 +00:00
Pankaj Kanwar
3a8ad81ab4 Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible." 2017-04-25 23:30:53 +00:00
Hall Liu
84c1ff86f6 Merge "Add Error specifiers to the API." am: 4c4a55a67b am: f729fccde9
am: 65030630fd

Change-Id: I9cf24d0ee8e8f94072fe2213ef17bb51240e1f8f
2017-04-25 22:40:15 +00:00
Jeff Sharkey
db73950734 Merge "Fix some issues found by new doclava linter." into oc-dev
am: a00c7c0a99

Change-Id: I940b5ab896e4638e8178868acb65d79c078adbbe
2017-04-25 22:25:09 +00:00
Hall Liu
f729fccde9 Merge "Add Error specifiers to the API."
am: 4c4a55a67b

Change-Id: Ia720a230e0f7f7070ca7194dbcfce294a66a3574
2017-04-25 22:17:14 +00:00
Jeff Sharkey
a00c7c0a99 Merge "Fix some issues found by new doclava linter." into oc-dev 2017-04-25 22:11:01 +00:00
Chen Xu
ac78d9ae25 Merge "Add VisualVoicemailService"
am: 8c6925a88f

Change-Id: I248baea501c4e1a47981e3aecfe476f89440f0af
2017-04-25 22:04:07 +00:00
Hall Liu
4c4a55a67b Merge "Add Error specifiers to the API." 2017-04-25 22:03:43 +00:00
Chen Xu
8c6925a88f Merge "Add VisualVoicemailService" 2017-04-25 21:54:53 +00:00
Brad Ebinger
004177815f Better handle MSIM DDS changed event
On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.

This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called
circularly.

Bug: 37361882
Test: Run Telephony unit tests
Change-Id: Iaa29bba25f82e699c96b951b3b110568163e12d8
2017-04-25 14:13:22 -07:00
pkanwar
161475cb6b Create Public API which exposes if the device is in a state where simultaneous
voice and data are possible.

BUG: 32912296
Test: Not required.
Change-Id: If603aa37c774157f0a3af12ca4ac6bafad94340d
Merged-In: If603aa37c774157f0a3af12ca4ac6bafad94340d
2017-04-25 20:11:49 +00:00
Ta-wei Yen
315b7da07e Merge "Add getVisualVoicemailSettings()" into oc-dev
am: 1c35554c5f

Change-Id: I16718e6b6fb135fbd7e7d19258e43d740a9e1fda
2017-04-25 19:58:17 +00:00
TreeHugger Robot
1c35554c5f Merge "Add getVisualVoicemailSettings()" into oc-dev 2017-04-25 19:45:47 +00:00
Jeff Sharkey
0f3f60b576 Fix some issues found by new doclava linter.
Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
2017-04-25 13:12:45 -06:00
Pankaj Kanwar
d6465983f1 Merge "Provide an API to make USSD calls and read the responses."
am: 41f48e3f18

Change-Id: Ia3244783e5df300ae6f8a4ad553e15e7e72f7965
2017-04-25 16:14:14 +00:00
Ta-wei Yen
683624afd2 Merge "Move sendVisualVoicemailSms and setSmsFilterSettings to Telephony" into oc-dev
am: 3db7350d7d

Change-Id: I428d6e101d46e216a1e6e34048f1d3da2fb5314e
2017-04-25 03:00:33 +00:00