606 Commits

Author SHA1 Message Date
Tyler Gunn
2b26e8dcd1 Merge "Un-@hide some missed video APIs." into mnc-dev 2015-05-29 18:18:37 +00:00
Tyler Gunn
a2df92512b Un-@hide some missed video APIs.
- renamed some methods to match what is in the non-remote version of
the API.
- Renamed RemoteConnection.VideoProvider.Listener to Callback.

Bug: 21474356
Change-Id: I4840e19921dafb4db288a4f8362b14d5dfa0aea1
2015-05-29 10:05:46 -07:00
Yorke Lee
d600966c39 Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 2015-05-29 00:55:12 +00:00
Yorke Lee
656eeb0402 Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Bug: 21499146
Change-Id: I3b931231807eec0aed91832013c7c055005fc9ad
2015-05-28 16:12:46 -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
Santos Cordon
d8faf70b80 Add intents for enabling phone accounts.
Bug: 20303449
Change-Id: If0057d42373b6964193c562ae8a8487a0299da76
2015-05-20 16:55:59 -07:00
Santos Cordon
91371dc036 Add enable/disable properties to phone accounts.
Bug: 20303449
Change-Id: Ie6203a284454d43f4dd20917f0f1fda0b36484f8
2015-05-19 13:06:21 -07:00
Sailesh Nepal
8309a19181 Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev 2015-05-15 01:40:26 +00:00
Sailesh Nepal
d9be9cfe5e Fix in-call UI crash on Nova devcies (framework/base)
If a status hint icon wasn't set we'd crash.
Fix was to set StatusHitns.mIcon to null if the icon resource ID'
was 0.

BUG: 21168985
Change-Id: I33c06169f9e184b063e6fd10f77408bc262ea3c8
2015-05-14 18:28:10 -07:00
Sailesh Nepal
ebb1d76e32 Merge "Fix post dial for remote connections" into mnc-dev 2015-05-15 00:55:41 +00:00
Sailesh Nepal
40451b3977 Fix post dial for remote connections
Use the correct callback (onPostDialChar instead of onPostDialWait).
This fixes a bug where every remote call would prompt the user
to send tones after the call became active.

BUG: 21004101
Change-Id: I1656a4266d0028ef29494a3cee169180267e16cd
2015-05-14 17:39:41 -07:00
Yorke Lee
abfcfdc044 Make Conferenceable an abstract class
Bug: 21066017
Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
2015-05-13 20:48:19 -07:00
Santos Cordon
e9ea718f30 Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev 2015-05-14 02:10:34 +00:00
Santos Cordon
ed769ae5d2 Improve javadoc for PRESENTATION_ constants.
Bug: 21089678
Change-Id: I045fd71a30c75c213dd5c0c64ded983ea5e5d866
2015-05-13 19:09:47 -07:00
Santos Cordon
d9e1fe3cd4 Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev 2015-05-14 02:07:58 +00:00
Yorke Lee
ad0bfe3ae2 Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev 2015-05-14 02:06:54 +00:00
Yorke Lee
e01f93557d Merge "Rename AudioState to CallAudioState" into mnc-dev 2015-05-14 01:21:16 +00:00
Santos Cordon
cad84a2070 [1/4] Use new Icon class in PhoneAccount.
Bug: 21088522
Change-Id: Ia03171d4861f758701e89733f4082863587e8c11
2015-05-13 16:57:48 -07:00
Ihab Awad
24145d451b Merge "Refactor StatusHints (1/3)" into mnc-dev 2015-05-13 23:26:05 +00:00
Ihab Awad
a7684ed638 Refactor StatusHints (1/3)
Refactor StatusHints to use the new Icon class.

Bug: 21040387
Change-Id: I3e7aae38127294b46859efb6a2aec71cf90e0e2a
2015-05-13 16:16:11 -07: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
Nancy Chen
782509076b Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev 2015-05-13 21:54:48 +00:00
Nancy Chen
16b84b0ab5 Add phone account field for voicemail to distinguish the source.
When inserting a voicemail, sometimes we will want to provide a phone
account so add relevant fields to voicemail object and builder.
Also added insertion logic for phone account details into
VoicemailContract.

Bug: 19990866
Change-Id: I8848cc86167a83f93248d809a6b0164f5ebf421f
2015-05-12 22:07:12 -07:00
Yorke Lee
32f2473160 More video related API fixes
android.telecom.Connection.VideoProvider
* onSetPauseImage takes Uri instead of String
* changeCallDataUsage -> setCallDataUsage
* add quality constants to changeVideoQuality() docs

android.telecom.InCallService.VideoCall
* setPauseImage takes Uri instea dof String

android.telecom.VideoProfile.VideoState
* Move constants to VideoProfile, prefix with STATE_

Bug: 21040387
Bug: 21066505
Change-Id: I764e72aced9d1e2d30d6d0cf0862100860d47c79
2015-05-12 16:45:14 -07:00
Santos Cordon
115cdd488b Merge "Fix build break." into mnc-dev 2015-05-12 21:23:06 +00:00
Santos Cordon
4055d64899 Fix build break.
Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4
2015-05-12 14:19:24 -07:00
Yorke Lee
d74c31e253 Merge "Fixes for APi review" into mnc-dev 2015-05-12 21:00:04 +00:00
Yorke Lee
400470fab9 Fixes for APi review
Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
2015-05-12 13:31:25 -07:00
Santos Cordon
3aea94ff56 Merge "Rename Connection time APIs for Conference.java" into mnc-dev 2015-05-12 20:25:59 +00:00
Santos Cordon
b804f8d8ff Add RemoteConference javadocs.
Bug: 21066411
Change-Id: Ie4cdfef58e6442531c3377cec4a708d67b790945
2015-05-12 12:57:43 -07:00
Santos Cordon
5d2e4f20fe Rename Connection time APIs for Conference.java
Bug: 21072487
Change-Id: I7bed9957770639f2adf3c7bd31a4821c0ff0f0dd
2015-05-12 12:47:45 -07:00
Tyler Gunn
6b3714939f Un-@hiding some missed VT APIs.
Bug: 20947116
Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
2015-05-08 11:35:55 -07:00
Yorke Lee
e0895660da Merge "Filter list of possible default dialers" into mnc-dev 2015-05-07 17:34:54 +00:00
Yorke Lee
9a7db1a6f5 Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-dev 2015-05-06 22:29:25 +00:00
Tyler Gunn
4538216a31 Change sendSessionModifyRequest VideoProvider API signature.
Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState.  This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
  - Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
2015-05-06 08:52:27 -07:00
Yorke Lee
a5d5c1d084 Fix potential NPE in TelecomManager.placeCall
Don't pass null parameters

Change-Id: Icf8f4eb3e96a51a5c091322c83ae163e366c21de
2015-05-05 16:36:22 -07:00
Yorke Lee
1542179bd2 Merge "Add hidden methods to set/get default dialer across users" into mnc-dev 2015-05-05 17:15:14 +00:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Yorke Lee
6526f67e45 Add hidden methods to set/get default dialer across users
First part of a set of changes to make the default dialer work
across multiple users. This initial CL should not affect any
user-facing behavior, just add new methods.

Bug: 20696062
Change-Id: If1651240e185b4c09e960260c822c9265069fb9a
2015-05-04 17:11:46 -07:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Andrew Lee
2378ea76d4 Add Properties to Call.Details.
Moved some capabilities to properties which seemed appropriate.

Bug: 20160395
Change-Id: Iacef4365822e5c3e50f0c41a501bf295c22055f1
2015-04-30 17:21:10 -07:00
Andrew Lee
011728fc3a Add handler parameter for callbacks.
Bug: 20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
2015-04-30 15:24:50 -07:00
Yorke Lee
f1a349bda3 Add default dialer checks to Telecom/Telephony
Check for the default dialer or the modify phone state permission
for various TelecomManager/TelephonyManager methods.

Make sure to check the user-selected default rather than the
hardcoded package name.

Exercise this code in TestDialerActivity.

Bug: 20304458
Change-Id: Ic04cd8f2ba98e1d54c39549ae89d3e11cd5cdafb
2015-04-29 16:21:00 -07:00
Yorke Lee
856a5ac704 Filter list of possible default dialers
Make sure they handle the ACTION_DIAL intent with the tel scheme

Bug: 20304411
Change-Id: I1822eff8bc014d4679352165ebe2bc819b82f75b
2015-04-28 17:05:00 -07:00
Yorke Lee
b7018ba660 Merge "Simplify DefaultDialerManager" into mnc-dev 2015-04-28 18:57:46 +00:00
Yorke Lee
8e0207ba5b Simplify DefaultDialerManager
The previous code worked with ComponentNames because it was
based off existing code for the default SMS application.
We only really need the package name however, so simplify the
code by storing and retrieving the package name directly.

Bug: 20304458
Change-Id: Icabd3a9f0f8166c105360494b601160d13767fad
2015-04-28 11:30:47 -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
Yorke Lee
d0922ed723 Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev 2015-04-27 22:49:34 +00:00
Yorke Lee
a162f02f76 Rename setDefaultDialerApplication for consistency
Change-Id: I8227df913bdb0ed5e1b3472f9d4ebea1158b366b
2015-04-27 15:17:50 -07:00