3847 Commits

Author SHA1 Message Date
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
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
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
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
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
Chris Manton
8bfefbbb53 Merge \"Add global settings for cell radio state\" into nyc-mr1-dev
am: d4ac4c7786

Change-Id: I5698d08dcc6854ceffb08debecf3fa443750fab0
2016-06-23 16:56:04 +00:00
Chris Manton
95a6c899d6 Add global settings for cell radio state
Provide persistable state for cell radio
to handle airplane mode similar to any
other radio in the system.

Change-Id: I87398fe84de3f6a10b0e1002e9e5bf7e61f9441f
2016-06-22 16:44:53 -07:00
Robert Greenwalt
eafd6a2c2d Merge \"Add a Carrier-config specific ratcheter of RATs.\" into nyc-mr1-dev
am: 23cac795b0

Change-Id: Ifa8987968a04e4df3eb3b85610c23a1b241de247
2016-06-22 21:19:01 +00:00
Robert Greenwalt
60551b6837 Add a Carrier-config specific ratcheter of RATs.
Only reports transitions to higher RATs within a given family.
Reset when we move to a new cell.
Avoids costly propogation of RAT flapping within the family,
for example every outgoing data pops us into a higher RAT and
idle time pops us back down.

bug:27360321
Change-Id: I549d79c1c74325981bee284cef452bd096184d86
2016-06-22 11:27:42 -07:00
Sanket Padawe
ac9cfbf548 Merge \"Unhide Network types in TelephonyManager\" into nyc-mr1-dev
am: 0df9721a08

Change-Id: I967f047882ef07aa8d5deb88a5ad379a3b37257d
2016-06-21 17:17:58 +00:00
Sanket Padawe
4652826d71 Unhide Network types in TelephonyManager
Bug: 29493935
Change-Id: Ib1bef4a68a962b0f473e07415d46ecff6080ea71
2016-06-20 12:40:07 -07:00
Sanket Padawe
1e31588227 Merge \"Modify TelephonyHistogram.java functions.\" into nyc-mr1-dev
am: ffaec89277

Change-Id: I1a5343468822da6531cb769f0526262e5fb34889
2016-06-17 17:29:43 +00:00
Sanket Padawe
ffaec89277 Merge "Modify TelephonyHistogram.java functions." into nyc-mr1-dev 2016-06-17 17:24:14 +00:00
Ta-wei Yen
e5ffc4ac23 Merge \"Allow the phone process to hide outbound text SMS\" into nyc-mr1-dev
am: 3f258857b5

Change-Id: Id54d7ac48c857234e43b828368ff0cd53facc0b0
2016-06-16 22:38:43 +00:00
TreeHugger Robot
3f258857b5 Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev 2016-06-16 22:31:45 +00:00
Sanket Padawe
0680f73f3d Modify TelephonyHistogram.java functions.
+ Update getBucketEndPoints & getBucketCounters to return values even when
 sampleCount < 10.

Bug: 28717269
Change-Id: Ie3d16d472d04f051442d22bbe0f9f63dece8cc46
2016-06-15 15:59:25 -07:00
Ta-wei Yen
1ecda97bdd Allow the phone process to hide outbound text SMS
Bug: 29095322
Change-Id: Ic6ce8aa18450815e91e8d819439b10ccc186fec7
2016-06-15 13:22:32 -07:00
Qingxi Li
96c1a81c56 Merge \\"Add a key for setting carrier\\'s CDMA roaming mode\\" into nyc-dev am: 130db7715a
am: bd012f68ac

Change-Id: I8eaac539138c7a6936afa9ef64d43690e0f533f5
2016-06-14 17:27:34 +00:00
qingxi
de9fe3597d Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I3385fe2660bf9da3f13ef90f4b4b17a8ad0b64ad
2016-06-14 17:17:18 +00:00
qingxi
bd012f68ac Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am: 130db7715a

Change-Id: I130ba1362d755e1859d5c22311867008d0626890
2016-06-14 17:15:41 +00:00
qingxi
247e7f4dca Add a key for setting carrier's CDMA roaming mode
Change-Id: If092f0b23dc7e320c27e4231605756e990949d15
bug: 28836467
2016-06-13 13:31:06 -07:00
Robert Greenwalt
248a1c2d7b Merge \"Clean up PCO plumbing.\" into nyc-mr1-dev
am: 4b6298b019

Change-Id: I3f0b125aeaa6c2016cef52c58771204e252b177b
2016-06-10 20:03:01 +00:00
Tyler Gunn
2a3f997b02 Telephony multi-endpoint disconnect causes.
A few disconnect cause mappings were missing for the multi-endpoint
disconnect causes.  Adding them here.

Bug: 29236416
Change-Id: I669bd72290c0e823c54eb6062ebd658743882852
2016-06-09 08:25:32 -07:00
Robert Greenwalt
eb17ccb608 Clean up PCO plumbing.
There's more data that needs to make it out to the carrier app.
Add the extras and correct some (it's a byte array, not an int, etc).

bug:28567303
Change-Id: I97ed41d9329ccc14851b8e171e8fa07919c8e38b
2016-06-08 20:25:39 -07:00
Sanket Padawe
3f8c335ec8 Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev
am: 2e9b43efd5

* commit '2e9b43efd53fbbce733b6e5c328f37c635c699a3':
  Fix bug while writing data to parcel in TelephonyHistogram.java

Change-Id: I47cce50a4fdcc0bf4c747a410dd07658424dd9f3
2016-06-07 21:00:49 +00:00
Sanket Padawe
2e9b43efd5 Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev 2016-06-07 20:52:59 +00:00
Sanket Padawe
b9f0053b0c Fix bug while writing data to parcel in TelephonyHistogram.java
Bug: 29117186
Change-Id: Ic694adc3323062e90c0e6586ea31e7691036ffcd
2016-06-06 15:49:42 -07:00
Stuart Scott
027e2d204e Merge "Add carrier config key for carrier setup app." into nyc-mr1-dev
am: 56760c65df

* commit '56760c65df6ca55d4570847b9f9777a23e2dfaf5':
  Add carrier config key for carrier setup app.

Change-Id: Ie6ab4cd355c061a7c6f04228fefde2ebf690eb59
2016-06-06 20:17:20 +00:00
Stuart Scott
9abc2735fa Add carrier config key for carrier setup app.
bug:28374700
bug:28374253
Change-Id: Icf56d4d2a89e32a062f3b8cc624f17e06c994599
2016-06-06 10:42:18 -07:00
fionaxu
2581d13f25 Merge "cold sim clean up" into nyc-mr1-dev
am: ba3428f01b

* commit 'ba3428f01b8cc112cd85d1c4ffcc1407a3b8b7c6':
  cold sim clean up

Change-Id: I5a2e24d997408badd6db7576b2fa206eb9e5c4ca
2016-06-04 05:53:44 +00:00
Chen Xu
ba3428f01b Merge "cold sim clean up" into nyc-mr1-dev 2016-06-04 05:48:47 +00:00
fionaxu
1bf6ec2f86 cold sim clean up
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
Robert Greenwalt
c4e25b26de Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am: 6a5c9560a3

* commit '6a5c9560a33337fc82362d77bc4bae633953428d':
  Add support for UNSOL PCO Data.

Change-Id: Idcf20b421f1174b3ddacaa6fde33b221a5ecbccf
2016-06-03 16:44:29 +00:00
Robert Greenwalt
6a5c9560a3 Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev 2016-06-03 16:38:58 +00:00
Sanket Padawe
a255d5de80 Merge "Merge commit \'b68601d247ef557fd3fd7e1cf6dcbe35030d1532\' into manual_merge_b68601d" into nyc-mr1-dev
am: 1a6b6fc266

* commit '1a6b6fc2664305de6e7102fa96506910fb7705dd':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I2d9db536538179a4fdca78613408dfd492b822b4
2016-06-03 00:44:49 +00:00
Sanket Padawe
a7f74b1d43 Merge commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532' into manual_merge_b68601d
Change-Id: I38ab50f3cf7a0fa4ca71a647021975fb9b3eb968
2016-06-02 17:20:08 -07:00
Sanket Padawe
701cd3fe15 Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
am: b68601d247

* commit 'b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
  Add carrier config variables for overriding carrier name from carrierconf.

Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
2016-06-02 23:15:57 +00:00
Robert Greenwalt
37409c5747 Add support for UNSOL PCO Data.
PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: Ibfc304800bb3d5b8706d56c08400c1d0b4453a55
2016-06-02 15:21:59 -07:00
Sanket Padawe
49b204264e Add carrier config variables for overriding carrier name from carrierconf.
Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
2016-06-01 12:17:23 -07:00
Jonathan Basseri
9a19e8948d resolve merge conflicts of 4c04097 to nyc-mr1-dev
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
  Change how TelephonyManager handles subscriptions.

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d
2016-05-26 23:13:17 +00:00
Jonathan Basseri
04c35e78db resolve merge conflicts of 4c04097 to nyc-mr1-dev
Change-Id: I256514588af20985108f72a5e204811904f87c9c
2016-05-26 11:41:17 -07:00
Jonathan Basseri
531cd8724c Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
  Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
2016-05-26 16:12:55 +00:00
Jonathan Basseri
4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev 2016-05-26 15:50:05 +00:00
Jonathan Basseri
8a6561d177 Change how TelephonyManager handles subscriptions.
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
2016-05-25 18:49:11 -07:00