summaryrefslogtreecommitdiffstats
path: root/telecomm/java
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-devSailesh Nepal2015-05-151-1/+2
|\
| * Fix in-call UI crash on Nova devcies (framework/base)Sailesh Nepal2015-05-141-1/+2
| | | | | | | | | | | | | | | | | | 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
* | Merge "Fix post dial for remote connections" into mnc-devSailesh Nepal2015-05-151-1/+1
|\ \
| * | Fix post dial for remote connectionsSailesh Nepal2015-05-141-1/+1
| |/ | | | | | | | | | | | | | | | | 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
* | Make Conferenceable an abstract classYorke Lee2015-05-134-32/+4
|/ | | | | Bug: 21066017 Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
* Merge "Improve javadoc for PRESENTATION_ constants." into mnc-devSantos Cordon2015-05-141-4/+12
|\
| * Improve javadoc for PRESENTATION_ constants.Santos Cordon2015-05-131-4/+12
| | | | | | | | | | Bug: 21089678 Change-Id: I045fd71a30c75c213dd5c0c64ded983ea5e5d866
* | Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-devSantos Cordon2015-05-141-186/+32
|\ \
| * | [1/4] Use new Icon class in PhoneAccount.Santos Cordon2015-05-131-186/+32
| |/ | | | | | | | | Bug: 21088522 Change-Id: Ia03171d4861f758701e89733f4082863587e8c11
* | Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-devYorke Lee2015-05-141-1/+1
|\ \
| * | Add BIND_TELECOM_CONNECTION_SERVICE permissionYorke Lee2015-05-131-1/+1
| |/ | | | | | | | | Bug: 21088342 Change-Id: I465307899d83c4a3ee5e88a28554c4b867c1f4ba
* | Merge "Rename AudioState to CallAudioState" into mnc-devYorke Lee2015-05-1413-45/+419
|\ \
| * | Rename AudioState to CallAudioStateYorke Lee2015-05-1313-45/+419
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Refactor StatusHints (1/3)" into mnc-devIhab Awad2015-05-131-35/+38
|\ \
| * | Refactor StatusHints (1/3)Ihab Awad2015-05-131-35/+38
| |/ | | | | | | | | | | | | Refactor StatusHints to use the new Icon class. Bug: 21040387 Change-Id: I3e7aae38127294b46859efb6a2aec71cf90e0e2a
* | Merge "Add phone account field for voicemail to distinguish the source." ↵Nancy Chen2015-05-131-5/+30
|\ \ | |/ |/| | | into mnc-dev
| * Add phone account field for voicemail to distinguish the source.Nancy Chen2015-05-121-5/+30
| | | | | | | | | | | | | | | | | | | | 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
* | More video related API fixesYorke Lee2015-05-1210-47/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix build break." into mnc-devSantos Cordon2015-05-121-1/+1
|\ \
| * | Fix build break.Santos Cordon2015-05-121-1/+1
| | | | | | | | | | | | Change-Id: Icca3603d3f4a38146fb9bc04a384a22ece4014f4
* | | Merge "Fixes for APi review" into mnc-devYorke Lee2015-05-1212-191/+153
|\ \ \
| * | | Fixes for APi reviewYorke Lee2015-05-1212-191/+153
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Move CameraCapabilities into VideoProfile Make PhoneAccount and PhoneAccountHandle final Bug: 21040387 Bug: 21066505 Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
* | | Merge "Rename Connection time APIs for Conference.java" into mnc-devSantos Cordon2015-05-121-8/+31
|\ \ \ | | |/ | |/|
| * | Rename Connection time APIs for Conference.javaSantos Cordon2015-05-121-9/+32
| |/ | | | | | | | | Bug: 21072487 Change-Id: I7bed9957770639f2adf3c7bd31a4821c0ff0f0dd
* | Add RemoteConference javadocs.Santos Cordon2015-05-122-10/+111
|/ | | | | Bug: 21066411 Change-Id: Ie4cdfef58e6442531c3377cec4a708d67b790945
* Un-@hiding some missed VT APIs.Tyler Gunn2015-05-084-18/+0
| | | | | Bug: 20947116 Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
* Merge "Filter list of possible default dialers" into mnc-devYorke Lee2015-05-071-5/+36
|\
| * Filter list of possible default dialersYorke Lee2015-04-281-5/+36
| | | | | | | | | | | | | | Make sure they handle the ACTION_DIAL intent with the tel scheme Bug: 20304411 Change-Id: I1822eff8bc014d4679352165ebe2bc819b82f75b
* | Merge "Fix potential NPE in TelecomManager.placeCall" into mnc-devYorke Lee2015-05-061-1/+5
|\ \
| * | Fix potential NPE in TelecomManager.placeCallYorke Lee2015-05-051-1/+5
| | | | | | | | | | | | | | | | | | Don't pass null parameters Change-Id: Icf8f4eb3e96a51a5c091322c83ae163e366c21de
* | | Change sendSessionModifyRequest VideoProvider API signature.Tyler Gunn2015-05-066-17/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add hidden methods to set/get default dialer across users" into mnc-devYorke Lee2015-05-051-10/+41
|\ \
| * | Add hidden methods to set/get default dialer across usersYorke Lee2015-05-041-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge changes from topic 'mwd-merge-050415' into mnc-devPrerepa Viswanadham2015-05-058-2/+98
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Merge commit '17455a3' into master_mergePrerepa Viswanadham2015-05-018-2/+98
| |\ \
| | * | Add plumbing for merge failures and renable button. (3/4)Anthony Lee2015-04-286-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixing issue where conference calls enable speaker phone.Tyler Gunn2015-04-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The issue was due to a mis-merge in ParcelableConference. The write of the status hints happens at the end of the writeToParcel method. Bug: 20503132 Change-Id: I40ef9b267b48876006e4cbe29e5ae09ba77bcb33
| | * | Add videoStateToString on videoProvider Class.Tyler Gunn2015-04-241-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Got tired of looking at numerical integer videoStates, so added a new "videoStateToString" static method, similar to how we have a Connection#capabilitiesToString method. Bug: 20257400 Change-Id: I39fcf413938c90e5993985f0976ad4fcce11505d
| | * | DO NOT MERGE Make CAPABILITY_CAN_PAUSE_VIDEO publicYorke Lee2015-04-211-1/+0
| | | | | | | | | | | | | | | | Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
| | * | DO NOT MERGE Make CAPABILITY_VIDEO_CALLING publicYorke Lee2015-04-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change was previously made in master Change-Id: Ica37a2060dca35ed6c734852a12b8f9ab27cd8aa
| | * | DO NOT MERGE Unfinal getPhone.Santos Cordon2015-04-162-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change to make it final was breaking existing apps. ...and other changes. Bug: 20283873 Change-Id: I8db4243850ad15f688dbca59ff5427b4799cbd1b
| | * | DO NOT MERGE Rename Call*Listener to Call*Callback.Andrew Lee2015-04-164-54/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the existing Listener methods and interfaces so that they can be replaced. Bug: 20160491 Change-Id: I11c104c625b03751f3792fc4367883c18c6e2d54
| | * | DO NOT MERGE Move Phone.java APIs into InCallServiceSantos Cordon2015-04-161-2/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is one step in the right direction of getting rid of Phone.java. Phone.java was deemed superfluous and this change moves the methods previously exposed in Phone.java into InCallService. This was done by having InCallService listen to Phone and pipe the calls as appropriate. However, state still lives in Phone and we eventually want to move that code into InCallService. That will be done in a later CL. Bug: 20160495 Change-Id: Id142431c253c1f24f260da42e8bedd1eb2ce448b
| | * | DO NOT MERGE Remove connection substateJay Shrauner2015-04-1610-206/+10
| | | | | | | | | | | | | | | | | | | | Bug:20300433 Change-Id: Ifefc08b5165de3e0b6ce92007e5f612879dcc4d9
* | | | Add Properties to Call.Details.Andrew Lee2015-04-302-59/+80
|/ / / | | | | | | | | | | | | | | | | | | Moved some capabilities to properties which seemed appropriate. Bug: 20160395 Change-Id: Iacef4365822e5c3e50f0c41a501bf295c22055f1
* | | Add handler parameter for callbacks.Andrew Lee2015-04-307-121/+497
| | | | | | | | | | | | | | | Bug: 20160491 Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
* | | Add default dialer checks to Telecom/TelephonyYorke Lee2015-04-292-10/+12
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Simplify DefaultDialerManager" into mnc-devYorke Lee2015-04-281-59/+21
|\ \
| * | Simplify DefaultDialerManagerYorke Lee2015-04-281-59/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Rename setDefaultDialerApplication for consistency" into mnc-devYorke Lee2015-04-271-1/+1
|\ \ \ | |/ / |/| |