Commit Graph

1369 Commits

Author SHA1 Message Date
Jack Yu
aa5df000ee Merge \\"Made severe and extreme alert configuration dependency configurable\\" into nyc-mr1-dev am: 338566df68
am: c26d7f3624

Change-Id: I286adf2ff6f989055b191065a1e737b494989bde
2016-07-20 02:54:57 +00:00
Jack Yu
c26d7f3624 Merge \"Made severe and extreme alert configuration dependency configurable\" into nyc-mr1-dev
am: 338566df68

Change-Id: I90c0669c74e15d92d00a639ad444866142a62c2e
2016-07-20 01:06:25 +00:00
TreeHugger Robot
338566df68 Merge "Made severe and extreme alert configuration dependency configurable" into nyc-mr1-dev 2016-07-20 00:57:52 +00:00
Youhan Wang
009b877c5c Merge \\"Add getCdmaPrlVersion().\\" into nyc-mr1-dev am: d71c64f715
am: 393ccd2a02

Change-Id: I62949a772e5355ca345f94d7dcedc8112de97863
2016-07-19 23:15:11 +00:00
Youhan Wang
393ccd2a02 Merge \"Add getCdmaPrlVersion().\" into nyc-mr1-dev
am: d71c64f715

Change-Id: I4c558086089b69c529019c9712e1fa2424a63e35
2016-07-19 23:10:27 +00:00
Youhan Wang
d71c64f715 Merge "Add getCdmaPrlVersion()." into nyc-mr1-dev 2016-07-19 22:59:13 +00:00
Hall Liu
635e6761d1 Merge \\"Add carrier config keys for disabling HD icon\\" into nyc-mr1-dev am: 9adea2e246
am: c05194428c

Change-Id: Ib54f7156d2f65ab65c64766a2249a5dc69b49562
2016-07-19 22:35:17 +00:00
Hall Liu
c05194428c Merge \"Add carrier config keys for disabling HD icon\" into nyc-mr1-dev
am: 9adea2e246

Change-Id: I1a43d0e6738a41860078ee710d5b57f9a9e66cd5
2016-07-19 22:30:31 +00:00
Jack Yu
e79419847c Made severe and extreme alert configuration dependency configurable
Before when extreme alert is disabled, severe alert will be disabled
by default because we assume users won't be interested in severe
alert if he is even not interested in extreme (higher level) alert.

Now carriers are allowed to turn this feature off by carrier config.

bug: 29369591
Change-Id: I3eb8a0c3e2df420ea75a77ec01cc447013434219
2016-07-19 15:20:06 -07:00
Hall Liu
7c3c28b6d9 Add carrier config keys for disabling HD icon
Add keys for whether a wifi call can be HD and whether a video call can
be HD.

Bug: 30013801
Change-Id: I36ab3647a96e5dbd217cff29030d3ac7a2e86f56
2016-07-19 11:18:49 -07:00
Youhan Wang
4eb5678ed8 Add getCdmaPrlVersion().
Bug:27612001
Change-Id: Icce9e99d360e30268d41bc063eeefc7484627df6
2016-07-19 10:21:15 -07:00
Vineeta Srivastava
bacc532874 Merge \\"Add carrier config to report IMEI on CDMA phone.\\" into nyc-mr1-dev am: a5b923bdd7
am: 199290cdab

Change-Id: Ia4f53257e352b3f71810582867258ec318cf47d6
2016-07-15 23:13:43 +00:00
Junda Liu
199290cdab Merge \"Add carrier config to report IMEI on CDMA phone.\" into nyc-mr1-dev
am: a5b923bdd7

Change-Id: I383718bd1e756f560485b12259f6a5c98dc8a8f6
2016-07-15 19:50:46 +00:00
Junda Liu
276f4d648b Add carrier config to report IMEI on CDMA phone.
Bug: b/29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
2016-07-15 12:04:24 -07:00
Jack Yu
83ca6571a1 Merge \\"Disable VT when users turn off data or hit data limit\\" into nyc-mr1-dev am: 92a07ae79d
am: 37506e246d

Change-Id: I8c3575407a785d7af9a3a9a73bd362275e55a75e
2016-07-14 05:14:02 +00:00
Jack Yu
37506e246d Merge \"Disable VT when users turn off data or hit data limit\" into nyc-mr1-dev
am: 92a07ae79d

Change-Id: Ia53f350beda8d9671cb67c2a01ed0071b65c4b76
2016-07-14 05:07:47 +00:00
Jack Yu
8781b68e2b Disable VT when users turn off data or hit data limit
Disable VT when users turn off data or hit data limit. If
there are ongoing VT calls, we'll need to downgrade them
to VoLTE calls.

bug: 27316521
Change-Id: I89fe42f6cf6c419c21c4f2006e9cb43cf7e13503
2016-07-13 16:32:25 -07:00
Tyler Gunn
58cca577c4 Merge \\"Finalize MEP functionality.\\" into nyc-mr1-dev am: 768cf076da
am: f92d4fcb2c

Change-Id: I0421ed193af425984a4624f73c774750eb34ab5f
2016-07-12 02:21:10 +00:00
Tyler Gunn
f476f1a91b Merge \\"Add carrier config for WFC promo mode.\\" into nyc-mr1-dev am: 3cc6935719
am: 80e8e8911e

Change-Id: Ia3abba983e00262bd3b71defb215e5d2f1fcadd4
2016-07-12 01:49:53 +00:00
Hall Liu
4102700852 Rename disable add call extra
Used to be DISABLE_ADD_CALL_DURING_VIDEO_CALL, now just
DISABLE_ADD_CALL. The meaning has also changed -- having the extra set
means that adding calls should be disabled no matter what.

Bug: 29047863
Change-Id: Icd8966492b264a9c64dc4880080a706032f0759c
(cherry picked from commit ee6e86b2bc)
2016-07-11 22:09:28 +00:00
Tyler Gunn
f92d4fcb2c Merge \"Finalize MEP functionality.\" into nyc-mr1-dev
am: 768cf076da

Change-Id: Idb9702f44f93ecf46ecf86cda2adbc596bdfc52f
2016-07-11 22:09:10 +00:00
Tyler Gunn
c96b5e0873 Finalize MEP functionality.
1) Finish plumbing of PULLING_CALL state.
2) Add new disconnect cause used when maximum number of calls across
all devices has been reached.
3) Add PII mask for toString of ImsExternalCallState.

Bug: 29522023
Change-Id: I78a0a9f3c3d846cfc58a1c5bcc6f105027602cbc
2016-07-11 10:33:37 -07:00
Tyler Gunn
80e8e8911e Merge \"Add carrier config for WFC promo mode.\" into nyc-mr1-dev
am: 3cc6935719

Change-Id: Ib135da9b8869da3396a98262f5e18f09ffbbad3e
2016-07-11 15:16:51 +00:00
Tyler Gunn
3cc6935719 Merge "Add carrier config for WFC promo mode." into nyc-mr1-dev 2016-07-11 15:04:30 +00:00
Hall Liu
b60e0bf477 Merge \"Rename disable add call extra\" into nyc-mr1-dev
am: 7e10bcffc5

Change-Id: Ide932c20b167bdfb9623cebd70d7732b53a80b34
2016-07-09 01:08:34 +00:00
Hall Liu
7e10bcffc5 Merge "Rename disable add call extra" into nyc-mr1-dev 2016-07-09 01:03:20 +00:00
Hall Liu
ee6e86b2bc Rename disable add call extra
Used to be DISABLE_ADD_CALL_DURING_VIDEO_CALL, now just
DISABLE_ADD_CALL. The meaning has also changed -- having the extra set
means that adding calls should be disabled no matter what.

Bug: 29047863
Change-Id: Icd8966492b264a9c64dc4880080a706032f0759c
2016-07-08 15:14:42 -07:00
Tyler Gunn
c3e6c93431 Add carrier config for WFC promo mode.
Adding new carrier config, defaulted to false, which allows a carrier to
promote the use of WFC when the device is connected to WIFI and WIFI
calling is disabled.

Bug: 27970317
Change-Id: I4904b7f006bae9f834816c1964025acf36b4ba84
2016-07-07 10:11:14 -07:00
Tyler Gunn
bba727d8ee Merge \\"Telephony multi-endpoint disconnect causes.\\" into nyc-mr1-dev am: 0babe967be
am: d3b6092a05

Change-Id: I8b756b5dd9c8bc1f98ebde57187cee16a50e6565
2016-07-01 20:47:49 +00:00
Tyler Gunn
d3b6092a05 Merge \"Telephony multi-endpoint disconnect causes.\" into nyc-mr1-dev
am: 0babe967be

Change-Id: Ic25889f342d388368f2f9122c706ebc3bce764bd
2016-07-01 20:39:19 +00:00
Tyler Gunn
0babe967be Merge "Telephony multi-endpoint disconnect causes." into nyc-mr1-dev 2016-07-01 20:23:16 +00:00
Jack Yu
fae0fe0745 Merge \"Merge \\"Added a virtual interface for Video Telephony call usage counting\\" into nyc-mr1-dev am: 83e96c1957\" into nyc-mr1-dev-plus-aosp
am: 3249cf25bd

Change-Id: I57546ac79c77543384fc5e0b327deda019ecc2b8
2016-06-29 22:17:39 +00:00
Jack Yu
92944f3e0a Merge \"Added a virtual interface for Video Telephony call usage counting\" into nyc-mr1-dev
am: 83e96c1957

Change-Id: Ia70a43a4df982cf09bb89b00650ce25aff7a43f4
2016-06-29 22:12:26 +00:00
Jack Yu
b6587eac06 Added a virtual interface for Video Telephony call usage counting
1. Added a virtual VT interface.
2. Qeury VT usage from telephony service.

bug: 20888836
Change-Id: I3df0c22922f8394554230b53f8ae091e17c95595
2016-06-29 11:54:56 -07:00
Hall Liu
674b428456 Merge \\"Add disable add call during video call extra and carrier config key\\" into nyc-mr1-dev am: 2cd8281a23
am: 2258e483f1

Change-Id: I7283e51cda559e4ea976bbd20d149697f7e54e46
2016-06-28 08:20:24 +00:00
Hall Liu
2258e483f1 Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
am: 2cd8281a23

Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9
2016-06-28 02:34:00 +00:00
Hall Liu
10208661cd Add disable add call during video call extra and carrier config key
Bug: 29047863

Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7
2016-06-27 17:19:59 -07:00
Tyler Gunn
bd6dfcc205 Merge \\"Add onConferenceSupportedChanged callback, carrier config.\\" into nyc-mr1-dev am: 780648be53
am: da457b206e

Change-Id: I8d2c147c2455dcf6dfcedfde43890b4962f7b4cd
2016-06-28 00:06:48 +00:00
Tyler Gunn
da457b206e Merge \"Add onConferenceSupportedChanged callback, carrier config.\" into nyc-mr1-dev
am: 780648be53

Change-Id: I71c24e971bf8d36fd5448497b85660be43417632
2016-06-27 21:40:04 +00:00
Tyler Gunn
780648be53 Merge "Add onConferenceSupportedChanged callback, carrier config." into nyc-mr1-dev 2016-06-27 21:35:49 +00:00
Sanket Padawe
2031d69810 Merge \\"Fix documentation of getTelephonyHistogram() api.\\" into nyc-mr1-dev am: afcc40f818
am: fe84c788e0

Change-Id: I7d666c23212797b824ea0387112636fb0861a2d5
2016-06-27 19:37:00 +00:00
Sanket Padawe
fe84c788e0 Merge \"Fix documentation of getTelephonyHistogram() api.\" into nyc-mr1-dev
am: afcc40f818

Change-Id: I82a3f890479ce0358b28d1ec6a42c9f154e0d3f0
2016-06-27 19:29:39 +00:00
Sanket Padawe
7f89016579 Fix documentation of getTelephonyHistogram() api.
Bug: 29760459
Change-Id: Ib7c4df81026331f88f6a8776c0042abf4f32c620
2016-06-27 11:57:01 -07:00
Tyler Gunn
7d633d3337 Add onConferenceSupportedChanged callback, carrier config.
Used to inform listeners when a connection can or cannot be part of a
conference.  Used to inform the conference controller so that it can
recalculate the conferencable connections.

Adding carrier config for carrier requirement.

Bug: 29059073
Change-Id: Iab028fd44d87c8dc2bbbe8bba7ba9ccdc223fe51
2016-06-27 10:49:04 -07:00
Tyler Gunn
d6d8745bb2 Add support for dropping fg video call on answer of audio call. am: 4b6614e576
am: b90e2dc722

Change-Id: I09a322e50a6989375f2ba1ec4a81b2fb0ee8876b
2016-06-23 20:52:30 +00:00
Tyler Gunn
b90e2dc722 Add support for dropping fg video call on answer of audio call.
am: 4b6614e576

Change-Id: Id51de6ca0d6f885a22374e2a2c0a38477a5e2df7
2016-06-23 20:21:09 +00:00
Tyler Gunn
4b6614e576 Add support for dropping fg video call on answer of audio call.
Adding two new carrier config options:
1. treat_downgraded_video_calls_as_video_calls_bool - when there is an ongoing
call which was previously a video call (or is currently video call), some
carriers require that this is treated as if it is a video call for
telephony logic such as in (2).
2. drop_video_call_when_answering_audio_call_bool - if the user is in an
active video call (see (1)) over wifi, and an incoming audio call comes in,
when this carrier config option is "TRUE", the video call will be dropped
when the audio call is answered.

Adding new connection extra to indicate to the dialer app that answering
a ringing call will cause the current active video call to drop.

Bug: 29275420
Change-Id: Ied5dbabc8ff09045ba41c5eba2136adad10db80e
2016-06-23 12:48:43 -07:00
Robert Greenwalt
5f7605d7b0 Merge \\"Add support for LTE CarrierAgregation\\" into nyc-mr1-dev am: 37a56b2891
am: bf9a513888

Change-Id: Ifab708f597af7a7ef782d8a8a754987094464f26
2016-06-23 19:09:59 +00:00
Ajay Nambi
bf9a513888 Merge \"Add support for LTE CarrierAgregation\" into nyc-mr1-dev
am: 37a56b2891

Change-Id: I802ea83a3e1e1328c48ba56142848033c3dc848b
2016-06-23 18:53:08 +00:00
Ajay Nambi
7965fa41c3 Add support for LTE CarrierAgregation
Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.

bug:27360321
Change-Id: If6ffbd02e3a7f170cc041747e32bb624234c3e09
2016-06-23 11:19:03 -07:00