Commit Graph

7943 Commits

Author SHA1 Message Date
Automerger Merge Worker
a166b4c136 Merge "Use new UnsupportedAppUsage annotation." am: c764cb634d am: fcde297afb
Change-Id: I8d7ae39c3b292efb3ed55fe5743da2e5872f5890
2020-01-15 14:23:06 +00: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
Automerger Merge Worker
c3fa9b5ae3 Merge "AudioEffect: add contructor for device effect" am: 41b4b849fc am: 8fd7d3762b
Change-Id: I04a7e8380d7d794c16274485eaacef0f49d20b13
2020-01-13 22:13:50 +00:00
Automerger Merge Worker
7868299890 Merge "AudioDeviceAddress: new class to store audio device information" am: 4ea970a8ed am: 30139dec91
Change-Id: I872982db401fe619e8dcc8d733f01b81debce84f
2020-01-13 22:05:06 +00:00
Eric Laurent
a25bf98613 AudioEffect: add contructor for device effect
Add a @SystemApi constructor to AudioEffect class
allowing to attach an audio effect to an input or output
device.

Bug: 136294538
Test: make
Change-Id: I0cb5cf5f38f95605a8605f3347aaa7e187db4e8a
Merged-In: I0cb5cf5f38f95605a8605f3347aaa7e187db4e8a
2020-01-10 11:28:00 -08:00
Jean-Michel Trivi
9f7e6eb601 AudioDeviceAddress: new class to store audio device information
Introduce a new class to store information about an audio device,
containing its role (input or output), device type and address.

Bug: 144440677
Test: atest AudioServiceHostTest#testAudioDeviceAddress
Change-Id: I86d32590c54609b8d8a9f7ea60d9b4bf76113935
Merged-In: I86d32590c54609b8d8a9f7ea60d9b4bf76113935
2020-01-10 11:28:00 -08:00
Automerger Merge Worker
859b6345c3 Merge "Use new UnsupportedAppUsage annotation." am: 57a0beab18 am: 2eff83dcb3
Change-Id: I48f93c43b66f4d329ef6068b4f74b4c68809c099
2020-01-10 15:17:50 +00:00
Artur Satayev
7651f0a4c0 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
Change-Id: I4bc8c9482e4bb1af21363f951affff7ee3fefeab
Merged-In: I4bc8c9482e4bb1af21363f951affff7ee3fefeab
2020-01-09 15:13:52 +00:00
Automerger Merge Worker
de4117c1cd Merge "Add spoken subtitle information to TvTrackInfo" am: e515bb6fb6 am: 2fba623381
Change-Id: I0b198c59944430638650e0a2294a193114d3ded9
2020-01-09 04:52:17 +00:00
Kyeongkab.Nam
f692b95b2a Add spoken subtitle information to TvTrackInfo
Add TIF API for getting spoken subtitle attribute for audio tracks
in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I2ebc27dae020bce14cd1a3464e91416c7a4415ec
2020-01-09 09:13:08 +09:00
Automerger Merge Worker
b373c7f8d3 Merge "Add hearingImpaired information to TvTrackInfo" am: 53379f83d1 am: 84ffee36cd
Change-Id: I2ac5ec9f0d19774cc9af3ae887c20e139044a10a
2020-01-08 18:44:09 +00:00
Kyeongkab.Nam
8bbcf8aae5 Add hearingImpaired information to TvTrackInfo
Add TIF API for getting hearing impaired attribute for audio and
subtitle tracks in order for TV App to use it.

Test: build
Bug: 112835103
Change-Id: I4046b5d49fcec2b944972bc532e844f0bdab9476
2020-01-08 17:51:27 +09:00
Automerger Merge Worker
4dd0da999b Merge "Add audio description information to TvTrackInfo" am: f04ee52d5a am: d0d2f7222f
Change-Id: Id2db7faafbd8a12cd5e46aacbfb32db9ac0d18b5
2020-01-08 03:27:10 +00:00
Treehugger Robot
f04ee52d5a Merge "Add audio description information to TvTrackInfo" 2020-01-08 02:43:24 +00:00
Automerger Merge Worker
9273dd9bc3 Merge "Mark DVB methods and classes as System APIs." am: 046609406d am: acb2a3c481
Change-Id: I47c18f8c7cae7cca62440edcdb05913bc7dc5431
2020-01-06 20:34:54 +00:00
Automerger Merge Worker
1c80c22f40 Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced am: 98274d96f5 am: 9868e4c737 am: 03bdd73cca
Change-Id: I1dd0de6e7c63fd6199def4578aef323af9322f90
2020-01-02 22:05:29 +00:00
Automerger Merge Worker
03bdd73cca Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced am: 98274d96f5 am: 9868e4c737
Change-Id: I60a049225fd042ee6c559c0a1dcbc99b4b49d92e
2020-01-02 21:50:42 +00:00
Nick Chalko
f26efab443 Mark DVB methods and classes as System APIs.
Guard with DVB_DEVICE permission.
Add @DvbDeviceType IntDef

Bug: 146385357
Test: m framework
Change-Id: Id6c77049e7338b6503adc12e14264fa4a892a65d
2020-01-02 13:19:43 -08:00
Automerger Merge Worker
98274d96f5 Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced
Change-Id: Id28175d26ec9910e184d5520cdf280e3ab831cf4
2020-01-02 21:11:32 +00:00
Automerger Merge Worker
af521c4ced Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27
Change-Id: I511da6d59c3b525cb678d6bb08a6cfa8e4e5a94f
2020-01-02 20:47:01 +00:00
Automerger Merge Worker
98b09fda03 Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" am: dcb8aa7cba am: 21984f9031
Change-Id: I1e0e5b57ff169354c33ac4c22bc5db83d87f19a3
2019-12-23 18:30:25 +00:00
Treehugger Robot
dcb8aa7cba Merge "Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs" 2019-12-23 18:03:35 +00:00
Automerger Merge Worker
5a1fd6750b Merge "Add OPUS encoding to the framework" am: 7252ee13be am: dfe9af14d3
Change-Id: Id49eb5581d46a855bd89f2c6485f2b5d5962d5e7
2019-12-23 10:24:45 +00:00
Rahul Sabnis
eeef865a2a Refactor AudioPlaybackConfiguration to reduce usages of hidden APIs
Bug: 141947725
Test: Manual
Change-Id: Ia95776cda3408c321d94494cb25b9cd85cb8662a
2019-12-20 14:48:57 -08:00
Kevin Rocard
3ae06329dc Add OPUS encoding to the framework
Audio offload support was added to AudioTrack in Q,
but only a few encoding were exposed (MP3 & AAC).

This patch adds only Opus support.
For R we probably want to expose all format that the framework supports.

Bug: 146540917
Test: AudioTrackOffloadTest AudioFormatTest
Change-Id: I2ca57d45081668f76f8d9e153f66d1fd41209685
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-12-20 19:30:18 +00:00
Automerger Merge Worker
f6253ef435 Merge "Revert "Use new UnsupportedAppUsage annotation."" am: edf7ce4f38 am: 019286764f
Change-Id: I48d12a1de59ea56b9423dc4100dfe464f093c083
2019-12-19 11:17:48 +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
757ed29038 Merge "AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING" into qt-qpr1-dev am: a2bfc8ce91
Change-Id: I199f8957c0df1d3efeb85cbe8e561e31045ee409
2019-12-19 00:42:17 +00:00
Jean-Michel Trivi
5e851cf9d8 AudioService: setMasterMute protected by MODIFY_AUDIO_ROUTING
Require MODIFY_AUDIO_ROUTING system permission to exercise
hidden (non-SDK, non-SystemApi) method setMasterMute

Bug: 141622311
Test: see bug for POC app
Change-Id: I4ee93276daa1285c55c4c838e2b43833135d76f6
2019-12-18 13:24:16 -08:00
Automerger Merge Worker
c7f44bacbe Merge "Use new UnsupportedAppUsage annotation." am: 1385dca8f6 am: 068a9faf3d
Change-Id: Ibad1c39310722d99f2de6bb0d9fad64caa5dbba1
2019-12-18 16:21:37 +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
1625c4d817 Merge changes from topic "msm_callback" am: 7e8dffc582 am: 4dc8b3207b
Change-Id: I387c36213524e474cf1617be02816b5acbde748a
2019-12-17 03:19:58 +00:00
Jaewan Kim
7e8dffc582 Merge changes from topic "msm_callback"
* changes:
  MediaSessionManager: Split abstract class Callback into interfaces
  MediaSessionManager: Use Executor instead of Handler
  Allow to register multiple callbacks in MediaSessionManager
2019-12-17 02:29:33 +00:00
Automerger Merge Worker
b083edb7ad Merge "Use TelephonyManager API to check if device is voice capable." am: c5480019ce am: 8bdcb6c2ce
Change-Id: I4aeee332f002f7777a94c50b85b4601bfec55108
2019-12-13 23:52:55 +00:00
Treehugger Robot
c5480019ce Merge "Use TelephonyManager API to check if device is voice capable." 2019-12-13 23:26:40 +00:00
Michele
72d27bb104 Use TelephonyManager API to check if device is voice capable.
Bug: 146075164
Test: make
Change-Id: I3f19a65012ea355091bbbf22ee3c11054ed19e37
Merged-In: I3f19a65012ea355091bbbf22ee3c11054ed19e37
2019-12-13 14:46:37 +00:00
Automerger Merge Worker
c93513a768 Merge "TIF: Add TvInputService#onHdmiDeviceUpdated()" am: efacbc6cc8 am: c08c2563cf
Change-Id: I9a223167038bb241aeaf0912d31f869c1cc4977b
2019-12-13 10:16:54 +00:00
Kyeongkab.Nam
f6d1e09fd7 TIF: Add TvInputService#onHdmiDeviceUpdated()
Add API to update device infos to TvInputInfo.

Bug: 145047101
Test: Manual
Change-Id: I67438193cc00d3bf76b8ebaa02869b6ff4e04b77
2019-12-13 02:06:12 +00:00
Jaewan Kim
f5ff735fae MediaSessionManager: Split abstract class Callback into interfaces
This CL splits the MediaSessionManager.Callback (abstract class) with
OnMediaKeyEventDispatchedListener and
OnMediaKeyEventSessionChangedListener (interfaces with default methods).

It's to follow the API guideline and also to help the Bluetooth for
minally registering callbacks. (The Bluetooth currently only overrides
onAddressedPlayerChanged)

Bug: 138648566
Test: Build and run
Change-Id: I8607662b00db7fb32cf3f4ee527c52b9fd8a6d7c
2019-12-12 10:23:14 +09:00
Jaewan Kim
c37f70d6fe MediaSessionManager: Use Executor instead of Handler
Bug: 138648566
Test: Build
Change-Id: I89a612cb1408dfb2cc4f624c7e0f8c8a55e0a732
Merged-In: I89a612cb1408dfb2cc4f624c7e0f8c8a55e0a732
(cherry picked from commit 95c783e2d2)
2019-12-12 10:23:06 +09:00
Sungsoo Lim
5fe3d3ae41 Allow to register multiple callbacks in MediaSessionManager
Bug: 126758528
Test: manually
Change-Id: I613593a88c115a5ac694b8c984f3ae36e9cc1c78
Merged-In: I613593a88c115a5ac694b8c984f3ae36e9cc1c78
(cherry picked from commit 14ddf75c47)
2019-12-12 10:22:55 +09:00
Marco Nelissen
1f20c66f56 Merge "Fix bad javadoc link" am: b002876a41
am: b6aaed3796

Change-Id: Ic8767b6afc40789a6b6c11c20edc61ede8da3c87
2019-12-06 14:42:45 -08:00
Marco Nelissen
b002876a41 Merge "Fix bad javadoc link" 2019-12-06 22:30:15 +00:00
Marco Nelissen
738d5e11ce Fix bad javadoc link
Method link was referring to itself.

Bug: 144964777
Test: build offline-sdk-docs, open doc in browser
Change-Id: Ib373b16d36ee91ebe10f5c6c2a635c65480a48e0
2019-12-06 10:37:31 -08:00
jiabin
621c415f5e Merge "Refactor audio device type in audio frameworks." am: dd2c24061d
am: 13d789d480

Change-Id: Id30c38a272831566a02680cff43072a45376b61d
2019-12-06 09:39:53 -08:00
Eric Laurent
042d6f1095 Merge "AudioService: communicate audio HAL process pids to native audioserver" am: e16beef1cd
am: 917934e7e5

Change-Id: I2ccce2d261e42e3c33d974d30b71bcebd0493f1b
2019-12-05 15:43:33 -08:00
jiabin
955b2132b1 Refactor audio device type in audio frameworks.
As audio device type can not be used as bit mask any more, refactoring
the code to use a set for a combination of audio device type instead.

Bug: 135621476
Test: atest AudioDeviceBrokerTest
Test: audio smoke test
Change-Id: I2c6fabfafcc6eaf607975076d9ee1a78887a2c85
Merged-In: I2c6fabfafcc6eaf607975076d9ee1a78887a2c85
2019-12-05 15:32:44 -08:00
Eric Laurent
a270b7c0e5 AudioService: communicate audio HAL process pids to native audioserver
Retrieve audio HAL processes pids from service manager and send them
to AudioFlinger native service. This is needed to dump audio HAL process tombstones
and because audioserver process does not have the SELinux permission to
list services.

Bug: 141528385
Test: Force watchdog and verify tombstone creation
Change-Id: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
Merged-In: I3e35b8040779e041b8d8c2e72d1e650d6f8fe818
2019-12-05 12:51:41 -08:00
Automerger Merge Worker
bc7cfe6370 [DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4daf am: 3d2b94bd5b am: e5151f8012
Change-Id: I3e0217a9954b8b134431682657d90f06408388b0
2019-12-04 02:56:04 +00:00
Automerger Merge Worker
e5151f8012 [DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4daf am: 3d2b94bd5b
Change-Id: Id28d26d99b0e2df0a43ef6f6e8034957343271f8
2019-12-04 02:41:19 +00:00