Commit Graph

4353 Commits

Author SHA1 Message Date
Brad Ebinger
da21d753c7 Merge "Notify ImsService Status Correctly" into oc-dev
am: 9684d718fa

Change-Id: Ia056fd9cc30e673056e7e9b5140c498bb6abce1b
2017-05-10 23:54:32 +00:00
Hall Liu
3afb78704a Merge "Increase limit of locale pairs" am: aa9a59ab32 am: 22ff1759d2
am: dba95b0c94

Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9
2017-05-10 18:58:23 +00:00
Robert Greenwalt
688ae17c11 Merge "Update startStreaming to return status code" am: 6476ceeaee am: a89cacebfb
am: 331058a871

Change-Id: Ie2bc9f47e7774a838829720379fc5865e71d2f0f
2017-05-10 17:50:17 +00:00
Hall Liu
22ff1759d2 Merge "Increase limit of locale pairs"
am: aa9a59ab32

Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308
2017-05-10 17:15:31 +00:00
Robert Greenwalt
a89cacebfb Merge "Update startStreaming to return status code"
am: 6476ceeaee

Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf
2017-05-10 17:11:12 +00:00
Hall Liu
aa9a59ab32 Merge "Increase limit of locale pairs" 2017-05-10 16:46:19 +00:00
Treehugger Robot
6476ceeaee Merge "Update startStreaming to return status code" 2017-05-10 16:46:14 +00:00
Brad Ebinger
e1b49b7654 Notify ImsService Status Correctly
Modifies ImsService to allow multiple status callbacks in
for one ImsFeature. This better handles one ImsFeature
for normal/emergency calling.

Bug: 38001858
Test: Unit Testing
Merged-In: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
Change-Id: I70ae6f5349aef75aa86d54fe37a3c32459ea3afa
2017-05-10 16:41:20 +00:00
Hall Liu
f5bd3d9d42 Merge "Changes to MbmsStreamingManager for test app" am: df57734354 am: 244912f414
am: 7249a96ce4

Change-Id: Ie9793c74f211c553bdf892a34889844792879946
2017-05-10 01:50:14 +00:00
Hall Liu
244912f414 Merge "Changes to MbmsStreamingManager for test app"
am: df57734354

Change-Id: I661e2cb4609f556d31e464d1cadff459b9b80354
2017-05-10 01:05:26 +00:00
Hall Liu
df57734354 Merge "Changes to MbmsStreamingManager for test app" 2017-05-10 00:50:49 +00:00
Robert Greenwalt
f725f98f17 Increase limit of locale pairs
This is just to avoid people injecting arbitrarily large
numbers here and causing crashes due to memory limitation.
Raised to a high enough level to avoid chance of hitting in practice.

Test: build
Change-Id: I1d2a245f9c391a9d6aec52bddd3dc086206d3e30
2017-05-08 16:44:08 -07:00
Robert Greenwalt
ff6c0e697c Update startStreaming to return status code
The StreamingService object will be constructed by the manager code.

Test: build
Change-Id: I53e321dbae14270d0df2c81774bf7f055baf216f
2017-05-08 16:41:38 -07:00
nharold
d38615b846 Merge changes from topic 'sms-files-move-opt-to-base'
am: abcc43d86a

Change-Id: Ib61b38a3fd065c3906e2e3f0863b83f2f4b740f4
2017-05-06 01:55:40 +00:00
Nathan Harold
a65e544478 Move newFromRil() function to a utility class
Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Code move to frameworks/opt/telephony../cdma/SmsMessageConverter

Bug: 33414487
Test: Manually verified GSM and CDMA SMS: MO and MT
Change-Id: I730d292c4aad6524b03b18c0751738a73a71ecf7
2017-05-05 18:11:11 -07:00
Nathan Harold
18e74566e4 Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
-Move the OTASP_* constants from SST
-Update references to those constants in TelephonyRegistry

Bug: 33414487
Test: compilation
Change-Id: I9516a8dfa9623d69d7e051749815e91ed3d013fa
2017-05-05 18:11:10 -07:00
Nathan Harold
daae72b311 Port Utility Functions from DefaultPhoneNotifier
-Move static utility functions from frameworks/opt/telephony/
 ..DefaultPhoneNotifier to a new utility class in frameworks/base

-Update TelephonyRegistry to point to the new functions.

Bug: 33414487
Test: compilation
Change-Id: I36a113cb5122569d451ec3a2dfa71d72d590fa52
2017-05-05 18:11:10 -07:00
Nathan Harold
1bc2c54ff6 Remove dependency on IccConstants from SmsManager
-Redefine the length of the SmsRecord in SmsManager

Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
2017-05-05 18:11:10 -07:00
Nathan Harold
f3e659e286 Move files from frameworks/opt/telephony to frameworks/base
Bug: 37688438
Test: compilation, boot on aosp_bullhead
Merged-In: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
Change-Id: I44d3d6231943ae0e7c3de4ab302e0cdff987aefe
2017-05-05 18:11:02 -07:00
Hall Liu
fa2115ec47 Changes to MbmsStreamingManager for test app
Add binding methods to MbmsStreamingManager
Add constants for synchronous binding exceptions

Test: testapp
Change-Id: Ie798c6008029c4201ec1bb3c98c11c4a949a048a
2017-05-05 15:43:03 -07:00
Jack Yu
4f08a4ab68 Merge "Moved data retry handler from broadcast to message." am: 19cd7568c6 am: 7e61d2a0de
am: 807e5f4684

Change-Id: Ica3f05b54c3f35cc05a07c9e2a4f29f59787802b
2017-05-04 18:28:18 +00:00
Jack Yu
7e61d2a0de Merge "Moved data retry handler from broadcast to message."
am: 19cd7568c6

Change-Id: I8a7c38b4cd6f1307cace357e206a93978e53d4bf
2017-05-04 18:13:24 +00:00
Brad Ebinger
e44125cd3a Merge "Better handle MSIM DDS changed event" into oc-dev 2017-05-04 17:11:52 +00:00
Jack Yu
ba740f0035 Moved data retry handler from broadcast to message.
The broadcast handler onReceive implmentations should
only handle minimum works. Made this consistent with
other DcTracker broadcast handler.

Test: Manual tests, Telephony sanity tests, and unit tests
bug: 37413302
Merged-In: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
Change-Id: I4c65b2f7b8aa5674eb7e131d26e404ec390ed19a
2017-05-04 09:52:17 -07:00
Brad Ebinger
979bab9f5d 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
Merged-In: I55cac364221c728ad1c77be783c358e8d98ec2b4
Merged-In: I68cd04f288f2d7006a2c55cba3584fd74117a1b8
Change-Id: Iaa29bba25f82e699c96b951b3b110568163e12d8
2017-05-03 23:09:32 +00:00
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