579 Commits

Author SHA1 Message Date
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
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
Tyler Gunn
d7017c42be Fixing issue where conference calls enable speaker phone.
- 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
2015-04-27 13:13:32 -07:00
Yorke Lee
610438230b Add utility method isDefaultOrSystemDialer
Will be used by various system components to determine if a
given package name is a privileged Dialer

Bug: 20333102
Bug: 20304411
Change-Id: I1e5bcbde8ee9a5dc6936b118b1b78f32d97737a6
2015-04-27 12:55:23 -07:00
Etan Cohen
f2570cb595 Merge "Doc fix - incorrect format (included argument) for function reference." 2015-04-25 01:44:27 +00:00
Etan Cohen
912270e22d Doc fix - incorrect format (included argument) for function reference.
Change-Id: I2cdf7b4f078b1ab0556fcc3fad5287f86641c396
2015-04-24 18:43:41 -07:00
Etan Cohen
4e4fec1b8d Merge "Fix documentation - non-public API." 2015-04-25 01:08:11 +00:00
Etan Cohen
237a59767d Fix documentation - non-public API.
Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8
2015-04-24 18:06:59 -07:00
Etan Cohen
cd895cdf4d Merge changes from topic 'mwd-merge-042415'
* changes:
  Rename removeVideoCallListener to unregisterCallback
  Bluetooth document fix: remove reference from open API to hidden entities
  Fix build due to merge of 7595842 and renaming due to 8eb87f0
  Merge commit '052a0da' into merge2
  Merge commit 'db1dbb8' into merge2
  Merge commit '7e5e791' into merge2
  Merge commit '170102d' into merge2
  Merge commit '4cb5d80' into merge2
  Merge commit '83cda00' into merge2
  Merge commit 'c91bc62' into merge2
  Merge commit 'cffc360' into merge2
  Merge commit '7f61051' into merge2
  Merge commit '167c3a7' into merge2
  Merge commit '4467b98' into merge2
  Merge commit '25a217c' into merge2
  Merge commit '04b18ec' into merge2
  Merge commit '7595842' into merge2
  Merge commit '2bbd2b6' into merge2
  Merge commit '4890351' into merge2
  Merge commit 'cd405fe' into merge2
  Merge commit '6ddbb5e' into merge2
  Merge commit 'de93575' into merge2
  Merge commit '9561e74' into merge2
2015-04-25 00:51:47 +00:00
Tyler Gunn
bde0b1e4c8 Add videoStateToString on videoProvider Class.
- 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
2015-04-24 23:47:37 +00:00
Yorke Lee
eca706ed9d Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage" 2015-04-24 23:11:42 +00:00
Etan Cohen
1418054108 Rename removeVideoCallListener to unregisterCallback
Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44
2015-04-24 15:22:03 -07:00
Etan Cohen
8942724930 Fix build due to merge of 7595842 and renaming due to 8eb87f0
I.e. rename mVideoCallback -> mCallback. Line with original name
was added in mwd, renaming was done in master. The renaming CL
was cherry-picked to mwd (and build probably fixed there).

Change-Id: I462a0fedd00293a148404e1419740bf492ae5de9
2015-04-24 14:06:40 -07:00
Etan Cohen
94f2c27aca Merge commit '7f61051' into merge2 2015-04-24 14:02:07 -07:00
Etan Cohen
f491a5844a Merge commit '04b18ec' into merge2 2015-04-24 13:56:58 -07:00
Etan Cohen
d7b4b81274 Merge commit '7595842' into merge2
Change-Id: I7e11e98e6d59562374195a8761d64a79dc0268e8
2015-04-24 13:56:35 -07:00
Santos Cordon
c1ec931f00 Fix up DisconnectCause description.
Change-Id: Ib2b52b6f8bc8fe945df3684f4e1ed9e04f78b061
2015-04-24 11:37:07 -07:00
Yorke Lee
1011f4870c Add APIs to getDefaultDialerPackage and getSystemDialerPackage
getDefaultDialerPackage is a public API and will be used by
apps to determine if they are the default dialer.

getSystemDialerPackage is a hidden API and is only used by
system components.

Also add new public string constants to allow apps to show
a dialog requesting that the user change the current default
dialer.

Bug: 20304458
Change-Id: I121d36741474c1fe171c372fb766a6c128228c9c
2015-04-24 11:12:34 -07:00
Santos Cordon
1ff1d3203f Merge "Remove CallState and rename PRE_DIAL_WAIT" 2015-04-24 00:06:55 +00:00
Yorke Lee
2973868885 Merge "Add TelecomManager.placeCall" 2015-04-23 23:49:24 +00:00
Yorke Lee
3e56ba14cc Add TelecomManager.placeCall
Places a new outgoing call using the system telecom service
with the specified parameters.

Making emergency calls using this method requires that the
method-caller is either the user-selected default dialer app
or preloaded system dialer app.

Requires that the caller have the
{@link android.Manifest.permission#CALL_PHONE} permission.

Bug: 20348183
Change-Id: Ieedb5628e8c6be25137944e7c3639dc1d9bc61df
2015-04-23 16:48:52 -07:00
Santos Cordon
e3c507b79b Remove CallState and rename PRE_DIAL_WAIT
Bug: 20532827
Bug: 20532435
Change-Id: I5f0308c5cf4e4a9cf9020b4fe7fa5f3f8dee6e67
2015-04-23 14:44:19 -07:00
Yorke Lee
6446d97942 Merge "Add hidden class in framework for managing the default dialer settings" 2015-04-23 17:23:41 +00:00
Yorke Lee
014de02dd2 Add hidden class in framework for managing the default dialer settings
Bug: 20303635
Change-Id: I7e7318086ade9531fb85f08b8e3f1f001ee0a8d9
2015-04-23 10:19:52 -07:00
Yorke Lee
170102d631 DO NOT MERGE Make CAPABILITY_CAN_PAUSE_VIDEO public
Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
2015-04-21 15:05:37 -07:00
Yorke Lee
c539080a93 DO NOT MERGE Make CAPABILITY_VIDEO_CALLING public
Change was previously made in master

Change-Id: Ica37a2060dca35ed6c734852a12b8f9ab27cd8aa
2015-04-21 15:03:29 -07:00
Yorke Lee
e661d9fb6f Make CAPABILITY_CAN_PAUSE_VIDEO public
Change-Id: If20f642a3d6bda886a68bb1e0ce459c38361a73c
2015-04-21 13:42:24 -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
Svet Ganov
d3c1ddb892 Merge "Add OP_READ_PHONE_STATE app op - framework" 2015-04-17 21:34:04 +00:00
Svet Ganov
16a1689950 Add OP_READ_PHONE_STATE app op - framework
The READ_PHONE_STATE permission protects PII information and
is in the Phone group. This change is adding the corrseponding
app op for gating access to the API guarded by READ_POHNE state
which will be used instead as an access control for legacy apps.

Change-Id: I2ff895a5a0e529f26ec0ad706266a30d829268ba
2015-04-17 20:43:56 +00:00
Santos Cordon
cffc3605ce DO NOT MERGE Unfinal getPhone.
The change to make it final was breaking existing apps.

...and other changes.

Bug: 20283873
Change-Id: I8db4243850ad15f688dbca59ff5427b4799cbd1b
2015-04-16 17:27:45 -07:00
Andrew Lee
8eb87f0da8 DO NOT MERGE Rename Call*Listener to Call*Callback.
Deprecate the existing Listener methods and interfaces so that they
can be replaced.

Bug: 20160491
Change-Id: I11c104c625b03751f3792fc4367883c18c6e2d54
2015-04-16 17:11:35 -07:00
Andrew Lee
84a264004d Remove deprecated VideoCallListener methods.
These shouldn't be needed because the video call APIs were never
previously made public.

Bug: 20160491
Change-Id: Ic9c5d0d1e8618bfe61f8905d4afaeaa37f51c915
2015-04-16 17:07:12 -07:00
Santos Cordon
7e24657d07 DO NOT MERGE Move Phone.java APIs into InCallService
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
2015-04-16 16:50:17 -07:00
Andrew Lee
600aaf013a Merge "Fix comment typos. =(" 2015-04-16 23:46:57 +00:00
Santos Cordon
223a80d7c6 Merge "Unfinal getPhone." 2015-04-16 23:42:01 +00:00