Commit Graph

250 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
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
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
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
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
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
Tyler Gunn
00d737bd17 More telephony updates for mainline.
Add new TelecomManager#getDefaultDialerPackage which is multiuse aware;
this is used when showing the voicemail notification.
Remove some @hide methods from Conference; push these inline.
Move ConferenceParticipantConnection into frameworks/opt/net/ims since
it is just an IMS implementation detail.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
2019-11-11 08:28:38 -08:00
Tyler Gunn
5567d7408c More telephony updates for mainline.
Add new TelecomManager#getDefaultDialerPackage which is multiuse aware;
this is used when showing the voicemail notification.
Remove some @hide methods from Conference; push these inline.
Move ConferenceParticipantConnection into frameworks/opt/net/ims since
it is just an IMS implementation detail.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
Merged-In: I39b6955cb14cc1ca68b05c620c3d09a2cdfe30c9
2019-11-08 21:27:32 +00:00
Chen Xu
7631ff7c48 new telephony annotation class
This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotations (applied in SDK/system API) to a separate
annotation class and having other module statically link to it.

TODO: include telephony annotation in framework-non-updatable-sources

Bug: 140908357
Test: Build
Change-Id: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit c9d4ee112e)
Merged-in: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
(cherry picked from commit 4712711d3d91621083bf92f5a1647b92c20a8b81)
2019-11-04 21:26:50 +00:00
Fan Zhang
5431ef5394 Introduce telecom api to launch emeregency dialer.
Test: manual
Bug: 136194151
Change-Id: I5c9732062e5123539343843fb9a9ae3ca7111890
2019-10-18 18:12:15 +00:00
Brad Ebinger
7c49b19c2f Merge "Add Telecom command for setting connectionservice filter" am: 25f4dca660 am: 05e03e8c0c am: 4d4dc1165a
am: 7acb9ff577

Change-Id: I2b4aa863848da2e0249c71577c55ecb0918a5ed0
2019-10-02 14:27:13 -07:00
Brad Ebinger
a9a33e1d68 Add Telecom command for setting connectionservice filter
For testing we need the emergency call to go through the CTS
ConnectionService. This is achieved by passing in a package
name filter for testing, which restricts which ConnectionServices
are available for emergency calling.

For safety this filter will be bypassed if the user calls an
actual emergency number (instead of a test number).

Bug: 138741228
Test: atest CtsTelecomTestCases
Change-Id: I656533e4a36a7bba48625bf6f763731991695aed
2019-09-30 17:46:36 -07:00
Chen Xu
c9d4ee112e new telephony annotation class
This is a preparatory work for mainline. since Intdef is hidden, so we
have to move some annotations (applied in SDK/system API) to a separate
annotation class and having other module statically link to it.

TODO: include telephony annotation in framework-non-updatable-sources

Bug: 140908357
Test: Build
Change-Id: I37f8a0624bbf27f264870ee9dbf03d3aaa5cadc1
2019-09-30 14:36:11 -07:00
Brad Ebinger
3636d74ead Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount
Allow Telephony to mark a SIM PhoneAccount as
emergency preferred, meaning that Telecom will
override a user's PhoneAccount preference for
emergency calls if the PhoneAccount has the
CAPABILITY_EMERGENCY_PREFERRED capability.

Bug: 131203278
Test: Manual testing, Telecom/Telephony unit testing
Change-Id: I88b8bbfa444f5445b2f0d6a1542c6406a19b240f
2019-05-22 19:52:01 +00:00
Ian Pedowitz
3bd719b534 Merge "Revert "Revert "Remove deprecated System APIs added in Q.""" into qt-dev 2019-05-15 16:28:54 +00:00
Tyler Gunn
f18ee4c9b8 Update API docs for TelecomManager#endCall.
Make it clear that ending an emergency call is not possible with this
method.

Test: Compile; this is a docs change.
Bug: 132438333
Change-Id: I736b90e31723ee2055cedf16142c4d0f494bf49b
2019-05-14 11:08:06 -07:00
Suprabh Shukla
169bed7b7a Revert "Revert "Remove deprecated System APIs added in Q.""
This reverts commit 79a19effee.

Bug: 129975435
Change-Id: I113c87f8c0b7ab225e4b99ef2462ae12e199b816
2019-05-13 21:04:39 +00:00
TreeHugger Robot
5968659e8f Merge changes from topics "role-dialer-dialog", "role-sms-dialog" into qt-dev
* changes:
  Deprecate intent action to the old changing default dialer/SMS dialogs.
  Remove TelecomManager.ACTION_CHANGE_DEFAULT_DIALER for apps targeting Q.
  Remove Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT for apps targeting Q.
2019-05-11 03:01:50 +00:00
Hai Zhang
929085f3c3 Deprecate intent action to the old changing default dialer/SMS dialogs.
Bug: 124452117
Bug: 131204827
Test: presubmit
Change-Id: Iee636cf2dbcf4bdda5fc487d6883591e9463b0af
2019-05-10 17:48:30 -07:00
Brad Ebinger
e7833312d7 Make getSimCallManager msim aware
When there are multiple subscriptions available,
the SIM call manager is currently resolved based
on what the default voice subscription is. Add the
ability for TelecomManager to get the SIM call
manager for a Telephony subscription ID.

Test: Manual; atest TelecomUnitTests
Bug: 131627085
Change-Id: I748fcebb44f07fbc9deef0c6a07d2f15a44b22d3
2019-05-10 00:08:20 +00:00
Ian Pedowitz
79a19effee Revert "RESTRICT AUTOMERGE Remove deprecated System APIs added in Q."
This reverts commit 02014297fd.

Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th

Bug: 129975435
Change-Id: Ia054b193a982dee669630555974d2d7831fe2b50
2019-05-02 00:54:39 +00:00
Sudheer Shanka
02014297fd RESTRICT AUTOMERGE Remove deprecated System APIs added in Q.
Test: Builds, boots
Bug: 129975435
Change-Id: I4bfd0bfbbc52b7822477ec0c70a08de6f85a3672
2019-04-30 10:49:28 -07:00
Tyler Gunn
556d24003a Telecom API doc cleanup.
InCallService - remove references to roles cut in Q release.
TelecomManager - make it more clear how to use the silenceRinger method
and under which conditions it should be used.

Test: Compile; docs only.
Fixes: 130285730
Change-Id: I55f9c2df119140666f8167e8521a4372d1108e7a
2019-04-11 21:30:39 +00:00
Tyler Gunn
a842e76231 Remove call identification APIs.
Removing the CallIdentification API surface.

Test: Build, run tests.
Bug: 129531123
Change-Id: I5f1451ffba04ee438df739a17472c028c44f19b2
2019-04-01 17:27:12 -07:00
Tyler Gunn
2c8143bae2 Merge "Remove support for event-based handovers." am: b2c1daf861 am: 3e232b28af
am: 4b4d6f3072

Change-Id: I65d196d86eeda26c757adce77119cd5f62e9fbce
2019-03-13 08:38:25 -07:00
Tyler Gunn
3e232b28af Merge "Remove support for event-based handovers."
am: b2c1daf861

Change-Id: I03aea3dffd4a7d1af24d281826f87945441d6d14
2019-03-13 08:17:56 -07:00
Tyler Gunn
9ae6db8a7c Remove support for event-based handovers.
Public APIs have been available for 2 releases; removing support
for the EXTRA/EVENT-based handovers.

Test: Manual
Bug: 110846969
Change-Id: I4747a509a9fd4d41c161febb78fbb7e4e11699f2
2019-03-12 20:45:32 +00:00
TreeHugger Robot
9b9406f8c1 Merge "Use a boolean Consumer instead of RoleManagerCallback." 2019-03-11 17:22:40 +00:00
Tyler Gunn
061317ba27 Merge "Remove TelecomManager#EXTRA_IS_ENABLED." 2019-03-11 14:40:28 +00:00
Hai Zhang
f5e8ccd88f Use a boolean Consumer instead of RoleManagerCallback.
And use RemoteCallback for it under the hood. This removes one AIDL
interface and allows using lambda, while aligning with what
PermissionControllerService does.

Bug: 127691087
Test: manual
Change-Id: Ia94e5bac59773380b2a4764d766bf6ff1dd5b7ff
2019-03-08 15:51:02 -08:00
Tyler Gunn
0bf854a0d2 Remove TelecomManager#EXTRA_IS_ENABLED.
This is not needed as part of the API given that RoleManager is used to
tell if InCallServices are enabled when filling the companion app
role.

Test: Build/make api
Bug: 126360569
Change-Id: I0da59cc17cf36e4a9e8cfacccce536c3e744bf53
2019-03-07 13:29:06 -08:00
Tyler Gunn
e694ef523b Correct nullability and final constraints on new APIs.
Per API review, correct nullability and final constraints on new Telecom
APIs.

Test: Build API.
Fixes: 126700293
Fixes: 126699447
Fixes: 126700465
Fixes: 126702895
Fixes: 126702527
Change-Id: Ic19664b156410e79a307b2af0d5672dc19f93c59
Merged-In: Icec15403493de596194a61b27bb3e1031fdc1099
2019-03-04 08:28:22 -08:00
Slava Shklyaev
e65e401305 Revert "Revert "Revert "Revert "Correct nullability and final constraints on new APIs.""""
This reverts commit 2fac9dd3d4.

Reason for revert: the change being reverted was not supposed to be
merged into git_master.

Change-Id: Ieb9169fdd242edb72774e5c3d5824bc54b55cc05
2019-03-04 16:14:29 +00:00
Slava Shklyaev
ae68d85fc3 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" am: 0bbf61f024 am: 08bc717117
am: 5317912537

Change-Id: Idab2d4174aa3d6a19f9573edf0d5ee3ecfa33201
2019-03-04 07:17:43 -08:00
Slava Shklyaev
0bbf61f024 Merge "Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""" 2019-03-04 14:42:17 +00:00
Slava Shklyaev
2fac9dd3d4 Revert "Revert "Revert "Correct nullability and final constraints on new APIs."""
This reverts commit b255be1307.

Reason for revert: the commit being reverted fixed git_master but broke aosp-master. This revert is aimed to fix aosp-master while not touching git_master.

DO NOT MERGE: This change is aimed at aosp-master only and should not be merged into git_master.

Change-Id: Ie5aaabb211affe2d21daaf87809641276d9d4707
2019-03-04 14:39:56 +00:00
Slava Shklyaev
fc291d1ed1 Merge "Revert "Revert "Correct nullability and final constraints on new APIs.""" am: 86e2035208 am: 6ced2f195d
am: 8e6b20f4f3

Change-Id: I0aa41b4fc5d08201deffccdaa25c50ae7942fe78
2019-03-04 04:40:09 -08:00