Commit Graph

1097 Commits

Author SHA1 Message Date
Sanket Padawe
4940b647a4 Merge "Add permission check for old call handover apis." am: e8fc3d2399 am: 7a97ee9acd
am: 440bd9cb05

Change-Id: Ibd08720dba54949234376d5a5ca021c722330091
2018-01-13 02:59:49 +00:00
Sanket Padawe
e8fc3d2399 Merge "Add permission check for old call handover apis." 2018-01-12 23:50:40 +00:00
Sanket Padawe
f6a9e5b6e0 Add permission check for old call handover apis.
Bug: 65415068
Test: manual
Change-Id: I4784debf1be255de24c341fe5474fc529bc1cebe
2018-01-12 10:17:42 -08:00
Joseph Pirozzo
d2a9fc7abe Bluetooth in band ring
Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.

Bug: 65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest

Change-Id: I40710787cab0215f0456153a3557aa8cf1a50cdf
(cherry picked from commit 40ea5eea41)
2018-01-11 14:07:25 -08:00
Joseph Pirozzo
2bcc515f25 Merge "Bluetooth in band ring" 2018-01-11 17:16:24 +00:00
Treehugger Robot
2f37060ee0 Merge "Add connection serivce focus api interface" 2018-01-09 22:54:42 +00:00
Brad Ebinger
806ab4220f Merge "Remove hashing for PII in Telecom Logging" am: e77808d936 am: 388aca53f1
am: d8b0a97ce4

Change-Id: I4867c726c391a346510c5579c7987bb868277f69
2018-01-09 21:28:13 +00:00
Joseph Pirozzo
40ea5eea41 Bluetooth in band ring
Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.

Bug: 65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest

Change-Id: I40710787cab0215f0456153a3557aa8cf1a50cdf
2018-01-09 11:46:31 -08:00
Pengquan Meng
63d25a5411 Add connection serivce focus api interface
This add new api interface to ConnectionService to support the
connection service focus api.

Bug: 69651192
Test: manually

Change-Id: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5
Merged-In: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5
2018-01-09 10:50:38 -08:00
Brad Ebinger
f784b29c9d Remove hashing for PII in Telecom Logging
Replaces the MD5 hash for logging PII in
Telecom with "***" instead.

Test: Manual
Bug: 67823981
Change-Id: Ieb089fe806663062a551ce7b9071e8b8f5fa9af7
2017-12-22 13:45:27 -08:00
Tyler Gunn
875aefc5fc Merge "Add logging and disconnect reason for null connections." am: 7661e81f85 am: c840efcf7e
am: 5d7c823e16

Change-Id: I57395d052d284ca3b8071b71dc762c1147d1107a
2017-12-21 20:43:39 +00:00
Tyler Gunn
7661e81f85 Merge "Add logging and disconnect reason for null connections." 2017-12-21 19:39:32 +00:00
Sanket Padawe
02d8c276d9 Receiving side Call handover API implementation.
Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:

Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
Merged-in: Ic0c4af19098252389648007628affc19a44f89dd
2017-12-20 10:13:05 -08:00
Sanket Padawe
85291f63c9 Implement Call handover initiation side APIs.
Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I692bb14fba66733154378c2dda525aa85c471a38
Merged-in: I692bb14fba66733154378c2dda525aa85c471a38
2017-12-19 16:32:24 -08:00
Tyler Gunn
fba1a8e61a Add logging and disconnect reason for null connections.
When a ConnectionService implementation returns a null connection, log this
and also set a unique disconnect reason to indicate in the telecom
dumpsys what happened.

Test: Manual
Bug: 70385625
Change-Id: Iff9846d434d400c4cf036e9ac46167cfb6f6b58c
2017-12-19 15:23:59 -08:00
Sanket Padawe
1982104e99 Merge "Receiving side Call handover API implementation." 2017-12-13 20:15:10 +00:00
Eric Erfanian
ec88187e62 Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.

Test: no existing unit tests found. could use some pointers
Bug: 35963245
Change-Id: I3ed8ac5ad7300c44f87e2573d9409b3a92b98ab6
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
2017-12-12 09:45:01 -08:00
Hall Liu
0afd2d0288 Merge "Add CarrierConfig key for RTT support" am: e5a913661d am: 79dc6fb815
am: 6365fde4c0

Change-Id: I652fb64918aaf7dbd87910d35329b2752914e937
2017-12-12 02:46:53 +00:00
Hall Liu
6365fde4c0 Merge "Add CarrierConfig key for RTT support" am: e5a913661d
am: 79dc6fb815

Change-Id: I11ef3f96e578e077288fe60725d326a20f45daf1
2017-12-12 02:11:04 +00:00
Sanket Padawe
4cc8ed53ac Receiving side Call handover API implementation.
Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#Bug:

Change-Id: Ic0c4af19098252389648007628affc19a44f89dd
2017-12-11 15:14:36 -08:00
Hall Liu
47ed62080f Add CarrierConfig key for RTT support
Add the carrier config key.

Test: add fake support for some random carrier, look for the capability
Bug: 63934808
Change-Id: I8a0e33a7ac10fbdcad356059913e7ddcba26bb6c
2017-12-11 14:41:31 -08:00
Eric Erfanian
4f6d728e62 Merge "Add assisted dialing properties to the framework." into oc-mr1-dev
am: 5d04d92265

Change-Id: Ib505b78a810099534907696b546213ad557343fb
2017-12-08 05:20:16 +00:00
Eric Erfanian
9765e89e1e Add assisted dialing properties to the framework.
These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.

Test: no existing unit tests found. could use some pointers
Bug: 35963245
Merged-In: I84343fb0cda16514c01997fd71d1e819b5b7eebb
Change-Id: I086e761ada9a57dca61c3a412561ee54255d6260
2017-12-07 18:34:35 +00:00
Eric Erfanian
62706c510c Add assisted dialing properties to the framework.
This is a manual merge of the oc-mr1-dev change
I086e761ada9a57dca61c3a412561ee54255d6260

These properties allow the feature to be propogated from
the outgoing call broadcast, to the connection, to the call,
and finally to the call log as a feature.

Test: no existing unit tests found. could use some pointers
Bug: 35963245
Change-Id: I84343fb0cda16514c01997fd71d1e819b5b7eebb
2017-12-07 10:29:17 -08:00
Jeff Sharkey
983df8cc6c Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Merged-In: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
2017-12-06 21:55:57 -07:00
Pengquan Meng
7f16a8d17d Merge "Add connection serivce focus api interface" 2017-12-06 18:53:10 +00:00
TreeHugger Robot
6798bc300e Merge "Enable outgoing emergency calls in LockTask mode." 2017-12-06 18:06:44 +00:00
Charles He
858f132e0c Enable outgoing emergency calls in LockTask mode.
As part of the LockTask 2.0 work, we allow DPCs to enable the system lock
screen in LockTask mode. When the device is protected by a PIN, pattern, or
password, the lock screen will have an entry point to the emergency dialer
which allows the user to make emergency calls (e.g., 911).

Therefore, we whitelist the activities that are necessary to place this
outgoing emergency call when LOCK_TASK_FEATURE_KEYGUARD is enabled.

Bug: 68750910
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Test: CTS verifier > CTS verifier > Managed provisioning > Device owner tests
      > LockTask UI
Change-Id: Iaeeec2c462b978d2d201c5660024a3dd7283ae07
2017-12-05 14:46:17 -08:00
Hall Liu
c823b876c1 Merge "Un-hide Connection-side RTT APIs for Dialer" 2017-12-05 19:40:14 +00:00
Pengquan Meng
731c1a38c0 Add connection serivce focus api interface
This add new api interface to ConnectionService to support the
connection service focus api.

Bug: 69651192
Test: manually

Change-Id: Iea49d95b086d32a0ebaf8e9f34fe4556953a0fd5
2017-12-04 18:38:25 -08:00
Hall Liu
37dfdb0c24 Un-hide Connection-side RTT APIs for Dialer
Bug: 63934808
Test: builds
Change-Id: I59a892fb0e314810e92dd9ad7d0c2f4610055045
2017-12-04 14:19:30 -08:00
Sanket Padawe
e29a266a62 Implement Call handover initiation side APIs.
Bug: 65415068
Test: Manual

Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Change-Id: I692bb14fba66733154378c2dda525aa85c471a38
2017-12-01 14:25:17 -08:00
Jeff Sharkey
9650a435ed Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
2017-11-22 12:28:09 -07:00
Tyler Gunn
efe5f129ad Merge "Add missing } on @link tag." am: 31b0c6fb32 am: 80bfc216ca
am: 847acf2b9a

Change-Id: I012fa6fdd42edd4f9ee912ea990700ba3c60f2f0
2017-11-17 19:45:00 +00:00
Tyler Gunn
80bfc216ca Merge "Add missing } on @link tag."
am: 31b0c6fb32

Change-Id: I2249cab4a50a9788cd8decb23fd8c60419ab6c21
2017-11-17 19:27:12 +00:00
Tyler Gunn
94ffde79b3 Add missing } on @link tag.
Test: Compiled code (this is a non-code change).
Bug: 69439905
Change-Id: I334ef7d74ac9802378b43a8f95979dcaf82c592f
2017-11-17 08:36:41 -08:00
Sanket Padawe
6884b5e1f5 Merge "API declarations for Call Handover." am: d88abc7b60 am: c376ca6bc1
am: 41cff321b6

Change-Id: Ia5013e7e0288f037cd94d24c40a72278a60cc50d
2017-11-16 02:08:32 +00:00
Sanket Padawe
c376ca6bc1 Merge "API declarations for Call Handover."
am: d88abc7b60

Change-Id: I0be6f240073408bf9520766238ecf791c016a40b
2017-11-16 01:45:25 +00:00
Pengquan Meng
7a14b31931 Merge "[Telecom] Improve hold capability signal" 2017-11-15 23:57:58 +00:00
Sanket Padawe
a8eddd48c4 API declarations for Call Handover.
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#

Bug: 65415068
Test: manual.
Change-Id: I0c2f561d92ad6504f858eadde09980fc1ce8727f
2017-11-15 13:41:05 -08:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Hall Liu
a591149cbc Merge "Update Telecom APIs to include multi-hfp" am: 025718e8f6 am: 3dd41b7b29
am: 518a82c94a

Change-Id: I0309cfd98f38a54b741a9dc09d1fb65159d5a4b7
2017-11-10 20:16:00 +00:00
Hall Liu
518a82c94a Merge "Update Telecom APIs to include multi-hfp" am: 025718e8f6
am: 3dd41b7b29

Change-Id: I27922fafa9c092e281c80fc6aa5f96c8e4e0c461
2017-11-10 20:07:15 +00:00
Hall Liu
a98f58b5c1 Update Telecom APIs to include multi-hfp
* Add bluetooth devices to CallAudioState
* Add methods for specifying a bluetooth device to InCallService
* Add methods for specifying a bluetooth device to Connection (for
self-managed connections)

Bug: 64767509
Test: unit tests
Change-Id: I286b19b423dc2ee417dbc90eda7e8055b2da2444
2017-11-09 15:54:50 -08:00
Tyler Gunn
79e2bf90c3 Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager.
When TelecomManager methods perform a read phonestate check from a work
profile user, it is possible to get an INTERACT_ACROSS_USERS exception.
This is due to the fact that the filterByIntent method was not calling
queryIntentActivitiesAsUser.

Test: Manual
Bug: 31304557
Merged-In: I6bc7419ba260050281d83e33f7f328ec5ccb3cd8
Change-Id: I2a1869162e5a52aed986a99cc378a6c630af4a70
2017-10-27 13:02:46 -07:00
Tyler Gunn
0a88f2e21b Ensure CallId is not null when connection creation is complete.
When calling "get" on the mConnectoinById map, a null callId will result
in an NPE.

In findConnectionForAction, defaulting to returning the "null" connection
which is the same behavior as if it isn't found.
In notifyCreateConnectionComplete, specifically checking if the callId
is null and skipping the onCreateConnectionComplete callback.
This scenario is possible if the connection is remove from the
ConnectionService before the connection complete callback comes back from
Telecom.

Test: Manual
Fixes: 62588734
Merged-In: I1de7a0a4cc9c630019e38b8154bfc1d470f56ae3
Change-Id: Ie610c51155ed417e0f916000fe20e4484bdb6603
2017-10-27 10:55:05 -07:00
Pengquan Meng
70c9885330 [Telecom] Improve hold capability signal
Add some method to the ConnectionService in order to notify the
connection changed.

Test: manually test and unit test
Bug: 66949982

Change-Id: I077902474f9af70e00a383aa269e1ae6ff9230a9
2017-10-20 16:02:04 -07:00
Tony Mak
82baea4641 Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev am: 72befffcbc
am: c5145fa25a

Change-Id: I4d7c7fbd530d1cc05679cdc4b7c044efb9d0ba40
2017-09-15 19:51:23 +00:00
Tony Mak
c5145fa25a Merge "getInstalledDialerApplications should not count ForwardIntentToParent" into oc-mr1-dev
am: 72befffcbc

Change-Id: Id711312d9bf0c6fe22cf93a166e533d9acf97452
2017-09-15 19:40:43 +00:00
Tony Mak
39198faea1 getInstalledDialerApplications should not count ForwardIntentToParent
Issues:
1. Work profile call is logged into work profile side even there
is no work profile dialer.
2. In Settings, "Android" is shown as the default work profile dialer.

Cause:
When are querying installed dialers in work profile,
getInstalledDialerApplications return android/ForwardIntentToParent
because we forward calls to personal side if work dialer
is absent. But apparently, ForwardIntentToParent is not an installed
dialer in work profile. So Settings shows "Android" as default work
dialer and Telecom wrongly think that we have work dialer and insert
calllog in to work profile side.

Solution:
Ignore cross profile resolver by checking targetUserId.


Test: Manual
1. Check Settings, no longer see "Android" is set as work dialer.
2. Make a phone call using work contacts, observed that the call
   is inserted into persoonal side.
3. Make a phone call using personal side, observed that the call
   is inserted into personal side.

BUG: 65672386

Change-Id: I13d4234ad1684f714e1b4d7704f2413d903a0179
2017-09-15 17:52:16 +01:00