Commit Graph

1562 Commits

Author SHA1 Message Date
Automerger Merge Worker
cf66c12e8b Merge "Ims: Add support for Adhoc Conference calls" am: 0ab00030a2 am: cac198c770 am: a6d033fa37
Change-Id: I866deb01383fdc648822ef60304f4ca54c36b699
2020-01-22 21:49:47 +00:00
Treehugger Robot
0ab00030a2 Merge "Ims: Add support for Adhoc Conference calls" 2020-01-22 21:16:19 +00:00
Ravi Paluri
80aa2140e3 Ims: Add support for Adhoc Conference calls
Add support for Adhoc Conference calls

Test: Manual
Bug: 62151032
Change-Id: Id50d235595d2133f867848ffdebdfe11e2f1c896
2020-01-22 03:22:58 +00:00
Automerger Merge Worker
5070ebc9cf Merge changes from topic "phone-constants-telecom" am: d982f6c3bb am: f4fafdbd69 am: ce94e0b7da
Change-Id: Id00cd3fe7b7f63115de1332892fc5837ee990ca0
2020-01-17 23:34:49 +00:00
Hall Liu
4a9fde1770 Move PhoneConstants constants to TelecomManager
Move the video-call related constants to TelecomManager since Telecom is
the only consumer.

Bug: 147845600
Bug: 146834818
Test: manually make a video call and verify audio route
Change-Id: I32ddaf6a237460bcf9431fee8a3f31c88d3e9361
2020-01-16 17:38:46 -08:00
Automerger Merge Worker
69ab6eeddb Merge "Add additional APIs in Call for Bluetooth" am: 719211525f am: 51c6389d72 am: 10cf15da5b
Change-Id: Ic8ab1af326c67a07ea65f5973756d24f286dfc25
2020-01-15 23:33:27 +00:00
Hall Liu
ef98bf8300 Add additional APIs in Call for Bluetooth
Add additional APIs in android.telecom.Call for consumption by Bluetooth
as they move to using an InCallService.

Also refactor ParcelableCall to use a builder pattern

Fixes: 147445725
Fixes: 147445603
Test: atest CallDetailsTest ConferenceTest
Change-Id: I12241b4ceadaa840f6e577bcfa8521375aedcb6a
2020-01-15 11:17:18 -08:00
Artur Satayev
53ada2ab28 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Merged-In: I853372f3c6fef905553bb31be4f1bb48df735f7a
Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
2020-01-14 15:54:55 +00:00
Philip P. Moltmann
00cf9fbf5d Send featureId to Telecomm noteOps
Bug: 136595429
Test: built
Change-Id: I23a12cd4453096e39dfd22ba556e3f3bc9d19319
2020-01-09 07:03:09 -08:00
Artur Satayev
2ebb31c00c Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'

Change-Id: I853372f3c6fef905553bb31be4f1bb48df735f7a
2020-01-08 16:06:00 +00:00
Automerger Merge Worker
8f90596741 Merge "Cleanup API docs for audio codecs and add intdef." am: dff38f5610 am: 1aba8b3f6c am: 23f3bba5b5
Change-Id: I9e60ae6c56f9b96ded118a533852ebdf4279d5c2
2020-01-07 00:21:09 +00:00
Tyler Gunn
dff38f5610 Merge "Cleanup API docs for audio codecs and add intdef." 2020-01-06 23:12:58 +00:00
Daniel Bright
dba2aa6e6c Moved RilRadioTechnology annotation
Moved annotation from Annotation to ServiceState

Bug: 146084549
Test: FrameworkTests, TeleServiceTests
Change-Id: I2411052465204d87cb5982102df0fd1af012a97c
Merged-In: I2411052465204d87cb5982102df0fd1af012a97c
2019-12-27 20:59:56 -08:00
Daniel Bright
d75d5344f4 Moved RilRadioTechnology annotation
Moved annotation from Annotation to ServiceState

Bug: 146084549
Test: FrameworkTests, TeleServiceTests
Change-Id: I2411052465204d87cb5982102df0fd1af012a97c
2019-12-22 18:01:05 -08:00
Tyler Gunn
1c687628e0 Cleanup API docs for audio codecs and add intdef.
- Cleanup the API docs for the audio codec constants.
- Add an IntDef for the constants
- Refer to IntDef in the EXTRA_AUDIO_CODEC definition.
- Cleanup API docs for EXTRA_AUDIO_CODEC to make it more clear that
the codecs mentioned are not the only ones supported.

Fixes: 146563762
Test: Compile/make update-api
Change-Id: If837c640033c76f32dfa25dcf9c7d1d6cb344d7b
2019-12-20 11:08:13 -08:00
Fan Zhang
c55310438b Merge "Introduce telecom api to launch emeregency dialer." 2019-12-19 22:07:42 +00:00
Fan Zhang
2b2458e094 Introduce telecom api to launch emeregency dialer.
Test: manual
Bug: 136194151
Change-Id: I5c9732062e5123539343843fb9a9ae3ca7111890
Merged-In: I5c9732062e5123539343843fb9a9ae3ca7111890
2019-12-19 20:50:31 +00:00
Automerger Merge Worker
90dc909c3a Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f am: f6253ef435
Change-Id: Id33f64eb9c8aa7d68cc52f7359b4f0a3d2675d8a
2019-12-19 12:13:32 +00:00
Austin Wang
edf7ce4f38 Merge "Revert "Use new UnsupportedAppUsage annotation."" 2019-12-19 10:09:11 +00:00
Austin Wang
a63a2c0130 Revert "Use new UnsupportedAppUsage annotation."
This reverts commit a5264903e2.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=sdk_phone_armv7-sdk&lkgb=6083299&lkbb=6085371&fkbb=6083313, bug b/146533269

Change-Id: Ie5b031d7b277cf0e09b0a9776b26bf74f5f69e70
2019-12-19 06:38:19 +00:00
Automerger Merge Worker
21b26dd979 Merge "Add post-call screen API." am: f5b6267d93 am: 1ad17b6ded am: 7e749b24bf
Change-Id: I6ecd2f7626c2f4686a7e02347a5ffacc6aaf5817
2019-12-18 22:03:06 +00:00
Grace Jia
91cec6ee8f Add post-call screen API.
Test: manual
Bug: 135929421
Change-Id: I63043646bb96b8543849c617ce1ccd41a558f24d
2019-12-18 21:07:40 +00:00
Automerger Merge Worker
277353090c Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d am: c7f44bacbe
Change-Id: I30839db2fe99ba4670ec1b39d5e64540fdd15f69
2019-12-18 16:31:41 +00:00
satayev
1385dca8f6 Merge "Use new UnsupportedAppUsage annotation." 2019-12-18 15:32:40 +00:00
Artur Satayev
a5264903e2 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv \
      git diff HEAD^ HEAD | grep '^[+-][^+-]' | grep -v '.import'
Change-Id: I087bb1cecbe59f1cf0c2e770c735d7a433722c6f
2019-12-18 12:07:36 +00:00
Automerger Merge Worker
f35a764e81 Merge "User cannot reject a waiting call after a switch call fails" am: ffd2e964c1 am: 86df43feba am: c5fa3f6e33
Change-Id: Id6a189032b12594630721ef450de488711691bc2
2019-12-17 21:48:17 +00:00
Tyler Gunn
ffd2e964c1 Merge "User cannot reject a waiting call after a switch call fails" 2019-12-17 21:09:56 +00:00
Tyler Gunn
8c7bd33748 Merge "Add Verstat fields to Telecom call/connection classes." am: 4efe689e4c am: 86445ea5c3
am: 5904b9ebe6

Change-Id: Ia93b27dd57b9a0292d2a951e022806a7c0090bd3
2019-12-06 00:28:49 -08:00
Tyler Gunn
4efe689e4c Merge "Add Verstat fields to Telecom call/connection classes." 2019-12-05 23:58:45 +00:00
Allen Su
1a88f1745b Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection" am: d154c93041 am: 5cc86edf81
am: f64a2dd67b

Change-Id: Ie604039589f880d5a48e2ebce64473a626726e61
2019-12-05 00:38:50 -08:00
Allen Su
d154c93041 Merge "Define EXTRA_AUDIO_CODEC_TYPE in Connection" 2019-12-05 01:32:21 +00:00
Automerger Merge Worker
166ab00cd3 Merge "Change name of setShouldScreenCallFurther" am: cebf791676 am: ddbfa780eb
Change-Id: I310c084a950d5a7556eff46e13a3bc549d1f0d32
2019-12-04 17:05:52 +00:00
allenwtsu
2aca989255 Define EXTRA_AUDIO_CODEC_TYPE in Connection
Bug: 143576354
Test: By manual
Change-Id: Ib8e701632676cfbe9993f1de2b58546f59ba580f
2019-12-04 15:21:19 +08:00
Hall Liu
cebf791676 Merge "Change name of setShouldScreenCallFurther" 2019-12-04 00:28:48 +00:00
Hall Liu
71a5de277e Merge "Expose new Telecom APIs for use by Telephony" am: fd191d895e am: 5defb332c9
am: 0c6a39b078

Change-Id: I187b58a7b9fd3234ba9cd367498723d0fcf06866
2019-12-02 14:13:52 -08:00
Tyler Gunn
d57d76c371 Add Verstat fields to Telecom call/connection classes.
Test: Added new CTS tests to verify operation.
Bug: 135929421
Change-Id: I42360dad677060e03ecec865f31145b1760cf46a
2019-12-02 13:59:17 -08:00
Hall Liu
fd191d895e Merge "Expose new Telecom APIs for use by Telephony" 2019-12-02 21:43:02 +00:00
Chen Xu
b6d1319d1a telephony annotations part 2
adding missing annotations

Bug: 140908357
Test: Build

Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
(cherry picked from commit f85cf993d3)
2019-11-20 14:09:16 -08:00
Brad Ebinger
15bc4c6a0c Merge "Add support for disconnecting outgoing calls for emergency calls" am: 252fcc7b27 am: 5dc01f163a
am: dd1cd69743

Change-Id: I588f15fd76f6bb1b863c612aa8f896be098317f4
2019-11-19 19:55:15 -08:00
Masaho Nishikawa
cb8fa7440e User cannot reject a waiting call after a switch call fails
Add new connection event to indicate switch failure.

Test: Manual - Verify that incoming call can be rejected after switch
call is failed.
Bug: 143918738

Change-Id: Ib38ceb3cb72ce946c071a8ec9748a1c81ca58808
2019-11-20 09:37:27 +09:00
Treehugger Robot
252fcc7b27 Merge "Add support for disconnecting outgoing calls for emergency calls" 2019-11-19 22:44:18 +00:00
Brad Ebinger
6271387650 Add support for disconnecting outgoing calls for emergency calls
1) Add CarrierConfig to allow/disallow holding calls for emergency
calls.
2) If holding an ongoing call for an emergency call is disallowed,
define a new DisconnectCause reason to notify telecom/dialer of this
disconnect reason.

Bug: 138741228
Test: atest CtsTelecomTestCases; atest CtsTelephonyTestCases
Change-Id: I7c6a1d0f648c598111ed047fbb9c609843c6aba9
2019-11-18 18:57:54 -08:00
Hall Liu
b230624a42 Expose new Telecom APIs for use by Telephony
Expose TelecomManager#getCallCapablePhoneAccounts(boolean) and
ConnectionRequest#getTelecomCallId

Bug: 141576153
Test: CTS
Change-Id: Ie0214fc93682229a3e5781f62743f00f68472702
2019-11-16 14:30:31 -08:00
Brad Ebinger
c890e023c7 Merge "Fix infinite recursion due to error log message" am: a57d7229ae am: 4f4181825a
am: 751351a022

Change-Id: I7681e833c032ac765bd712b9d5ba122a4ca78b2a
2019-11-14 15:23:47 -08:00
Brad Ebinger
c4044355eb Fix infinite recursion due to error log message
Bug: 144446106
Test: atest TelecomUnitTests:SessionTest
Change-Id: I382f90ad6f91262b06ac8816ecf1ecabfa9f6bb6
2019-11-13 16:51:16 -08:00
Tyler Gunn
d1da43b514 Merge "Cleanup video provider binder code." am: 398794c0a6 am: bd9bf9f9c7
am: b0078ccd04

Change-Id: Idc1ff7ed64dd0c6fa70e39c14ca97cd174e58a84
2019-11-12 13:21:14 -08:00
Grace Jia
82fe63b484 Merge "Add response to notify that an outgoing call is screened." am: 46758be25c am: 4f8cd35a90
am: 12726efeeb

Change-Id: I021a114961a776a82f67b7c39410e642b50083c3
2019-11-12 13:14:40 -08:00
Tyler Gunn
398794c0a6 Merge "Cleanup video provider binder code." 2019-11-12 20:47:38 +00:00
Treehugger Robot
46758be25c Merge "Add response to notify that an outgoing call is screened." 2019-11-12 20:44:43 +00:00
Tyler Gunn
d1fdf3a85b Cleanup video provider binder code.
1. Ensure we always unlink for death from the VideoCallImpl.
2. Ensure we compare the binders in the Call instance properly so that
we are not always replacing the VideoCallImpl used.
3. Ensure we cleanup the VideoCallImpl when its being removed.

Test: Manual testing of video calls for regressions.
Bug: 121156974
Change-Id: I440e8fb4ab9a5051ee02358933c495de736e2bd0
2019-11-12 10:43:09 -08:00