42 Commits

Author SHA1 Message Date
Roshan Pius
e927ec02f5 Maintain call time across SRVCC (2/3).
When an IMS conference call encounters an SRVCC event requiring a
fallback to GSM/CDMA, we need to maintain the call time for the
conference host across this fallback. So, adding a connectTime attribute
in the underlying conference host's connection object which can be used
to account for the call time from the now inactive conference call into
the new call created.

BUG: 21918593
Change-Id: I13e7ae6e31f004e798776c02ac7a6ac09a10f0bd
2015-07-15 15:47:21 -07:00
Santos Cordon
895d4b8f63 Telecom API council changes.
- adding more javadocs.
- fixing javadoc on isEnabled
- renaming to CONFIGURE_PHONE_ACCOUNT

Bug: 21573551
Change-Id: Ice035b8573a08ea18181a73c9e9a462520a934f1
2015-06-29 16:17:47 -07:00
Santos Cordon
6b7f955c2d Add extras to Connections/Calls. (1/3)
Two major changes:
1) Add the notion of extras to a Connection.  These extras will be
parceled through to InCallService as Call.getExtras()
2) The previously existing Call.getExtras() has been renamed to
getIntentExtras(). This name better describes the fact that these
particular extras are from the original CALL or INCOMING_CALL intents.

Change-Id: I08c1baf4f08d54757f98012f0c08b423a707c53d
2015-05-28 09:43:00 -07:00
Yorke Lee
ad0bfe3ae2 Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev 2015-05-14 02:06:54 +00:00
Yorke Lee
249c12e7b8 Add BIND_TELECOM_CONNECTION_SERVICE permission
Bug: 21088342
Change-Id: I465307899d83c4a3ee5e88a28554c4b867c1f4ba
2015-05-13 16:12:44 -07:00
Yorke Lee
4af5935c71 Rename AudioState to CallAudioState
Deprecate AudioState class and make methods @SystemApi where
necessary to minimize impact to SystemApi
Replace usages of AudioState inside Telecom sub-systems
Fire both onCallAudioStateChanged and onAudioStateChanged callbacks
for backward compatibility
Support both setAudioState and setCallAudioState for all classes

Bug: 21040387
Bug: 21088300
Change-Id: I3ec7b3afdaa344c6d639d1c421f1842d67f7d0f7
2015-05-13 14:58:15 -07:00
Tyler Gunn
6b3714939f Un-@hiding some missed VT APIs.
Bug: 20947116
Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
2015-05-08 11:35:55 -07:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Anthony Lee
17455a3d39 Add plumbing for merge failures and renable button. (3/4)
The merge failure is not plumbed up through any layer that
can trap the callback and act on it.  The first part of this
fix is to create that plumbing.  Then we need to reenable the
merge button. At this point in time, we leverage the fact
that forcing the call to reassess its capabilities will poke
the InCallUI to reenable the merge button. In the future, we
should plumb the merge failure all the way to InCallUI and
not only handle the button but display UI to the user. The UI
is currently being displayed by CallNotifier which is the wrong
place. See b/20530631 for more details.

Bug: 20229905
Change-Id: I0355ada46b484c6db4bee656c77386dd61be5e1f
2015-04-28 07:13:34 -07:00
Etan Cohen
94f2c27aca Merge commit '7f61051' into merge2 2015-04-24 14:02:07 -07:00
Tyler Gunn
4cf116ff20 Merge "API Cleanup - rename IConferenceable to Conferenceable." 2015-04-20 20:12:47 +00:00
Tyler Gunn
df2cbc8989 API Cleanup - rename IConferenceable to Conferenceable.
Bug: 20165255
Change-Id: If4cb323749b6ef9e8657506434d760d07c34167f
2015-04-20 09:13:01 -07:00
Jay Shrauner
6f20a6a2b4 DO NOT MERGE Remove connection substate
Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
2015-04-16 15:05:05 -07:00
Jay Shrauner
8f98843924 Remove connection substate
Bug:20300433
Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
2015-04-16 14:42:39 -07:00
Andrew Lee
3e3e2f2b9c Fix missing comma.
Change-Id: Ied739e7f1b6d548237821db553f27994b0ee92af
2015-04-16 13:49:30 -07:00
Andrew Lee
0f51da328d resolve merge conflicts of edc625f to m-wireless-dev.
Change-Id: Ibbcd764505ccc38f9f61c96993d979a099f1cc6b
2015-04-16 13:11:55 -07:00
Jay Shrauner
1cf9b6bec1 DO NOT MERGE Make Telecom/InCallUI APIs public
Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
2015-04-15 14:42:24 -07:00
Jay Shrauner
55b97525f0 Make Telecom/InCallUI APIs public
Bug:20260870
Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
2015-04-15 12:03:48 -07:00
Andrew Lee
edc625f52e Add StatusHints to Conference object.
+ Consolidated ParcelableConference constructors; only one is used.

Bug: 20181703
Change-Id: Iad49f10404e1c1eedc4ef68525bde0f10a8dfc97
2015-04-15 11:05:19 -07:00
Rekha Kumar
07366813cd IMS-VT: Upgrade/Downgrade change
-Add isVideo API to VideoProfile.VideoState

IMS-VT: Fix propagation of device orientation.
Orientation received at VT Service is incorrect.
Fixed propagation of device orientation to VT service.

IMS-VT: Upgrade fix
-Add session modify call timed out constant

Notify listeners of video quality changed event
- Propagate the video quality changed message to the UI.

IMS: Add support for video quality
- Add Config interface to get/set video quality

IMS-VT: Multitasking feature
-Support for video multitasking

IMS-VT: Modification of data usage aidl
Change data usage aidl interface to take parameter type long
instead of int

Change-Id: I7cda2a689edb86d025dfe8efc8f573918c4bd6bc

Propagate the call substate changed message to the UI

IMS-VT: Add call modifiable capability

PhoneCapababilities call type modifiable constant added

IMS-VT: Add a bit mask CALL_SUBSTATE_ALL with all call substate bits set

IMS-VT: Enable Video conferencing.

Enable Video conferencing.

Change-Id: I4240aa6f32c75d6eea8a41da3c87bca651f0901b

IMS-VT: Add hide for setVideoProvider API
Observed compilation error for SDK generation due to setVideoProvider
API. Marking setVideoProvider as hide inorder to resolve the
compilation error.

IMS-VT: Add persist.radio.ims.audio.output for VT calls
-- Add persist.radio.ims.audio.output to set the default speaker
   for VT calls.
-- Add required constants

IMS-VT: Add additional error codes for upgrade downgrade
-Add support to send additional error codes to UI during
 upgrade downgrade.

Change-Id: Id452d225098fe3bccdcd37d242985c5c761144c1
2015-04-01 21:40:45 +00:00
Tyler Gunn
cd5d33c89f Fix for call timer resetting when starting IMS conference call. 1/4
- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: I501edde3b62f6bf021eb7455089e80626013da12
2015-01-12 09:02:01 -08:00
Nancy Chen
27d1c2d148 Pass onPostDialChar call back from Telephony to Telecom.
Add plumbing to alert Telecom every time a character is processed after
the post dial wait state (the processing happens in Telephony).

Bug: 18644688
Change-Id: I487d76aa9c959ca528c6377374aa35c2d0b4a803
2014-12-16 12:53:04 -08:00
Ihab Awad
5c9c86ec0f Telecom API updates (1/6)
Bug: 18292176

Change-Id: I060366234a5a60510c385dc837f2b7e79596eaf5
2014-11-28 15:54:35 -08:00
Tyler Gunn
6d76ca0438 Change Connections to allow setting conferenceable with conferences.
- Added IConferenceable interface used so that connections and conferences
can both be considered candidates as "conferenceable" with a connection.
- Fixed ConnectionService#conference to support cases where either call 1
or call 2 is a conference and the other is a connection.  Previously did
not support cases where call 2 is a conference.

Bug: 18200934
Change-Id: I32a8dd30a154d6280f2ae89fd147817235998465
2014-11-17 15:49:51 -08:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.*
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.

Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
2014-11-10 11:52:31 -08:00
Anthony Lee
30e6584249 Change access to removeConnection so we can override it.
Bug: 18056632
Bug: 18240234
Change-Id: I4e82051a27f3565e9a854df8b27c35300cdbe2ad
2014-11-06 16:47:20 -08:00
Santos Cordon
a663f86fd3 Even, Even more telecom javadoc.
Bug: 18142177
Change-Id: Ic952f3a81cb957bc5b9b6d0aa755adaab9fb74aa
2014-10-31 15:28:46 -07:00
Tyler Gunn
4a57b9b59b Creating connections for conference event package participants.
- Add "addExistingConnection" method to connection service which provides
a way for a connection service to notify telecom of a pre-existing
connection (connections are normally created through telecom).
- Modify TelephonyConferenceController to retrieve its state from a
multiparty connection in the conference (in the case of IMS calls, this
would be the ImsCall that manages the conference) instead of just taking
the first one.

Bug: 18057361
Change-Id: I26993aec54ecb0ce90ae6983fd3eed9d8d0a5773
2014-10-30 14:27:48 -07:00
Yorke Lee
7a394311ad am 770ed6ec: Fix build break
* commit '770ed6ec920ec10798c5b7a7b4850ccc0b2a531f':
  Fix build break
2014-10-07 03:31:21 +00:00
Yorke Lee
770ed6ec92 Fix build break
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
(cherry picked from commit 9858af0ec68ad28db60047587c8eb6232b4a6591)
2014-10-07 03:13:12 +00:00
Yorke Lee
0b27c28377 am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-dev
* commit '7e552595bda0825787820e3d9bb58b5fad32cd01':
  Add ability to add sim-initiated MO call to UI (2/4)
2014-10-07 01:04:30 +00:00
Yorke Lee
c3cf982d18 Add ability to add sim-initiated MO call to UI (2/4)
Add supporting (hidden) APIs to TelecomManager to add the ability to
add a previous unknown call to Telecom

Bug: 17787391

Change-Id: Ibdfaee81a55e11451c146751cf970980dccad435
2014-10-06 15:09:00 -07:00
Ihab Awad
12a4df2b66 resolved conflicts for merge of ead63f02 to lmp-mr1-dev
Change-Id: I20d5f9d8aae82f0cb6f0ebf2ac1cb0af05eb8c9b
2014-10-01 14:31:01 -07:00
Ihab Awad
50e3506533 Refine implementation of GSM conferences (1/3)
Bug: 17684223
Change-Id: I05d05b594803ea2c1da4247111b70ad5f870ac46
2014-09-30 16:46:39 -07:00
Evan Charlton
8635c578f0 Revert "@hide ConnectionService APIs."
This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
2014-09-24 14:06:12 -07:00
mike dooley
95e8070e29 Fixing ConcurrentModificationException.
Implementing review feedback.

Bug: 17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
2014-09-23 17:34:10 +00:00
Tyler Gunn
711d876fd1 @hide ConnectionService APIs.
Bug: 17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
2014-09-23 10:00:38 -07:00
Yorke Lee
1c4eb10cc1 Merge "Add missing methods to Conference object" into lmp-dev 2014-09-17 03:29:12 +00:00
Andrew Lee
2678639f9e Fix disconnect log printf in ConnectionService.
Bug: 17534940
Change-Id: I41499701d1f7a3ab0816624d27094c6c86fb5b01
2014-09-16 18:17:44 -07:00
Andrew Lee
7f3d41fd12 Add new DisconnectCause class to telecomm.
+ Add a hidden "UNKNOWN" default type to ToneGenerator.
- Hide the Telephony DisconnectCause from the public API.
+ Add a Telecomm DisconnectCause. This is parcelable, and contains
information (code, user facing message, non-user facing reason,
and tone) to help describe the disconnect state and what behaviors
an application can implement for the user experience. This reduces
the causes for a disconnect to a more generic set.
+ Lots of work to pipe this through. DisconnectCause replaces the
code and message which were formerly passed around.

Bug: 17241433
Bug: 17329632
Change-Id: I9d337e478a8784bcc0ade02267c2df52cac9bf17
2014-09-16 12:07:41 -07:00
Yorke Lee
a0d3ca9746 Add missing methods to Conference object
Add setAudioState, onPlayDtmf and onStopDtmf to the conference object.
This fixes DTMF tones for conference calls.

Bug: 17512380
Change-Id: Ice9403d3d750131f077a3ea129b7f67430c68348
2014-09-15 19:18:13 -07:00
Tyler Gunn
ef9f6f957d Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
2014-09-12 22:16:17 -07:00