8 Commits

Author SHA1 Message Date
Tyler Gunn
8a2b1199a6 Fixing conference merge where only one party is added to conference.
- Adding "onConferenceStarted" listener for Connections.
- This is necessary so that an ImsCall can report the fact that it has
went from being a single party call to a multiparty call.  This was not
previously necessary since the multiparty bit change would be detected
when one of the connections being merged changed state.  Since we now must
defer the establishment of the conference until all connections have been
merged, we need a means of detecting when the call becomes multiparty.

Bug: 18960042
Change-Id: I3ba138cb546e3efdf89b29d6676d00257a5e00cd
2015-01-29 11:47:24 -08:00
Bryce Lee
1061652a37 Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 2015-01-28 17:50:39 +00:00
Bryce Lee
034dc3839f Revert "Make THEATER_MODE_ON setting a system api."
This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
2015-01-28 17:45:35 +00:00
Bryce Lee
d8cb404035 Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 2015-01-28 17:03:57 +00:00
Nancy Chen
c059271ca4 Update system-api for new getLine1Number() method.
Add new method in TelecomManager to system-current.txt.

Bug: 19087382
Change-Id: Id6db61fed45301cc1a15ded6e362d7858f24a273
2015-01-26 12:35:35 -08:00
Bryce Lee
35dafda1b0 Make THEATER_MODE_ON setting a system api.
This will allow an unbundled home to continue accessing this property.

Bug: 19043538
Change-Id: I845a8726e617ca7b6f7f7347a0ac5aa0620d6658
2015-01-26 08:21:10 -08:00
Jinsuk Kim
3379c1cb62 Fix broken build
Updated system-current.txt

Change-Id: I1f80d5543f0a828cf59d50d1271916a1210674d3
2015-01-23 17:13:50 +09:00
Ying Wang
02937eba32 Check in "current" system API files.
The API files were generated by running "make showcommands update-system-api".

Bug: 18960664
Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9
2015-01-20 16:30:47 -08:00