Commit Graph

7900 Commits

Author SHA1 Message Date
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
Jin Seok Park
013afc4daf [DO NOT MERGE] Return correct offsets for getAttributeRange()
Cherry-picked from ag/9745767

Currently, the offset value returned from getAttributeRange() does
not take into account the offset to the EXIF data within the image
file. This CL fixes the code to return the correct offsets.

The existing test code could not detect this issue because it does
not explicitly seek to the given offset and retrieve/compare the
data. This CL also adds test code to do this. Make tag information
is also added because all test files have this information, while only
a select few have thumbnail/GPS tag information.

This CL also fixes a bug where the thumbnail offset was not being
updated if the data was passed with StripOffsets tag.

Bug: 143118731, Bug: 143663411
Test: atest ExifInterfaceTest
Change-Id: Ia147cdcacf4699c5e7efc43f52e58b945032a51f
2019-11-20 13:30:22 +09:00
Robert Horvath
85e44e1976 Merge "Rename OWNER to OWNERS for media/tv" am: a4ff2b159f
am: 16a5ce0026

Change-Id: I1b3eb99edaef15e43f2c10e4bbc67665455d74f4
2019-11-18 01:10:38 -08:00
Robert Horvath
7fba59ebcb Merge "Add OWNERS for media TV" am: 4776c31c22
am: e207293928

Change-Id: I786b4bd5bd8463d1217c9ca1f9e91d673498c4bc
2019-11-18 01:09:21 -08:00
Robert Horvath
16a5ce0026 Merge "Rename OWNER to OWNERS for media/tv"
am: a4ff2b159f

Change-Id: I6fb78bc065217e79f3425d999ee75e37fe2edc4c
2019-11-18 01:07:48 -08:00
Robert Horvath
e207293928 Merge "Add OWNERS for media TV"
am: 4776c31c22

Change-Id: I218c902b159ed68aa083130287d41fc7806bae5d
2019-11-18 01:05:37 -08:00
Robert Horvath
a4ff2b159f Merge "Rename OWNER to OWNERS for media/tv" 2019-11-18 08:13:40 +00:00
Robert Horvath
4776c31c22 Merge "Add OWNERS for media TV" 2019-11-18 08:10:47 +00:00
Robert Horvath
ff389051bf Rename OWNER to OWNERS for media/tv
OWNERS file was misspelled.

Test: n/a
Change-Id: If71bebd6a0a7c7e7242e485fc27da0fdb70a7e96
2019-11-12 15:47:01 +01:00
shubang
8da39947ad Add OWNERS for media TV
Nick is the TLM of media TV.
Adding OWNERS to avoid bugging people from other media teams

Test: n/a
Change-Id: I2c99a7a1ab78c634fc94dfe96b6617b0bde4efdf
Merged-In: I2c99a7a1ab78c634fc94dfe96b6617b0bde4efdf
2019-11-12 15:45:37 +01:00
Artur Satayev
756d3b447a Merge "Add @UnsupportedAppUsage annotations for greylist." am: 423c3a32d6
am: 7a565c45b1

Change-Id: I48075ef4296e0b55c0055f7364c5129bbd60e9ed
2019-11-11 09:33:13 -08:00
Artur Satayev
7a565c45b1 Merge "Add @UnsupportedAppUsage annotations for greylist."
am: 423c3a32d6

Change-Id: I5387b4742fdaf67ad3189356f2361f73969b53a8
2019-11-11 09:13:24 -08:00
Artur Satayev
fc46be7dbd Add @UnsupportedAppUsage annotations for greylist.
go/cleanup-greylist-txt

These have already been greylisted, however due to bugs/omissions in the tooling have been kept in go/greylist-txt instead of being annotated in the code.

Bug: 137350495
Test: m

Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
Merged-In: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-11-08 16:17:13 +00:00
Pawin Vongmasa
a802a56b45 Merge "MediaCodec: Release lock before calling onFrameRendered()" am: c03b91a7ef
am: 23b72c725c

Change-Id: I5615c10df08d88ef397bd28eaa23582503d4356f
2019-11-08 06:06:30 -08:00
Pawin Vongmasa
23b72c725c Merge "MediaCodec: Release lock before calling onFrameRendered()"
am: c03b91a7ef

Change-Id: I362a0153d83363b0c2b419480dcbe01df6976a90
2019-11-08 06:00:38 -08:00
Pawin Vongmasa
5a07fb4e59 MediaCodec: Release lock before calling onFrameRendered()
Test: atest CtsMediaTestCases -- \
--module-arg CtsMediaTestCases:size:small

Bug: 143672592
Change-Id: I4fb55eb8a90913544a793097c977fee539e09776
2019-11-07 15:54:54 -08:00
Joshua Baxter
3e878bda5a Merge "docs: fix typo" into qt-dev am: 49357cbf9e am: 01b5ee8eca
am: bcc7d237a6

Change-Id: I631367114c9fb8509c50c9b8d43dcb4da8a328b8
2019-11-06 14:22:16 -08:00
Joshua Baxter
bcc7d237a6 Merge "docs: fix typo" into qt-dev am: 49357cbf9e
am: 01b5ee8eca

Change-Id: I449250128879b14a4cf9da7c43f8d40af765c4d6
2019-11-06 14:05:27 -08:00
Joshua Baxter
e14bb68ce1 docs: fix typo
Change-Id: Ia0dab15920fdbead1842ff5a20ec6d4988f11fbe
test: make ds-docs
bug: 79355169
Exempt-From-Owner-Approval: docs-only change
2019-11-06 21:20:37 +00:00
Shuzhen Wang
eae340df69 Merge "ImageWriter: Do not override UNKNOWN format twice" into qt-qpr1-dev
am: b78d7355b7

Change-Id: I7d1946267cfe2ea848850cac494dd2a8bd383755
2019-10-31 07:55:59 -07:00
Xin Li
6f48900f50 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: If5056a73ede668b0048ca107b686413695e5b3b6
2019-10-30 14:33:01 -07:00
Shuzhen Wang
db1322fab1 ImageWriter: Do not override UNKNOWN format twice
Currently when application calls ImageWriter.newInstance(Surface, int,
int), the default format of UNKNOWN is overridden to surface format in
Java side before being overridden again to user specified format (from
RGBA to IMPLEMENTATION_DEFINED). This breaks backward compatibility with
certain gralloc implementations.

Do not override UNKNOWN format in Java side.

Test: testWriterFormatOverride
Bug: 143637345
Change-Id: Ie61157bca11f623eff2b8c0ed2a988c86da07cb2
2019-10-30 21:17:48 +00:00
Nick Chalko
3a6f4226ca Merge "Add OWNERS for media/tv files" am: c91c7ab339
am: a0f0da0bd1

Change-Id: I75dbf8c9ecd9827b216933af11acef856cd3a6aa
2019-10-29 15:52:55 -07:00
Treehugger Robot
c91c7ab339 Merge "Add OWNERS for media/tv files" 2019-10-29 22:31:08 +00:00
Jean-Michel Trivi
54ca7f7696 Merge "AudioService: handle errors when reconnecting mixes after server crash" am: 0ac7e561e9 am: 933083b88c
am: d9b96d99a1

Change-Id: Ifaaf16f32a7e9a4cc1136ee0c124f4a0914e6c4b
2019-10-23 10:13:25 -07:00
Marco Nelissen
047c40807e Merge "Move MidiDeviceInfo to libamidi, its only user" am: 7a2fb04c22 am: e399a7f824
am: 72fab3af33

Change-Id: I001aed6c2d8cf0104f1c079d2628a1ba3cbe3f28
2019-10-23 10:03:37 -07:00
Treehugger Robot
0ac7e561e9 Merge "AudioService: handle errors when reconnecting mixes after server crash" 2019-10-23 16:40:09 +00:00
Jean-Michel Trivi
d497edd979 AudioService: handle errors when reconnecting mixes after server crash
Log errors when reconnecting dynamic policy mixes after an audio
server crash.
  Add IntDef for AudioSystem errors, and conversion to String.
  Add support for notifying an AudioPolicy user that it was
unregistered.

Bug: 133279309
Test: connect DAP, kill audio server, verify no errors reported
Change-Id: I1dbfdac1873ed9c44c20ca9d25bbe01ce9904ee5
Merged-In: I1dbfdac1873ed9c44c20ca9d25bbe01ce9904ee5
2019-10-23 08:22:00 -07:00
Marco Nelissen
eab83b8080 Move MidiDeviceInfo to libamidi, its only user
This removes the libmedia dependency from libamidi, and reduces
overall size.

Test: build
Change-Id: I16b62ef8288bc68a46ae9ac6318efb95fa469e4f
Merged-In: I16b62ef8288bc68a46ae9ac6318efb95fa469e4f
2019-10-23 07:58:56 -07:00
Marco Nelissen
ad2bc6a178 Merge "Move JetPlayer implemention and JNI" am: 147d162e10 am: 256948b814
am: 5c31848594

Change-Id: I64f4e37eeb88f3c15afed1b1afa541c2fe265722
2019-10-17 18:06:18 -07:00
Marco Nelissen
f0ef85669c Move JetPlayer implemention and JNI
The JetPlayer implementation in libmedia was only used by the
JetPlayer JNI code in libandroid_runtime. This change moves
both implementation and JNI to libmedia_jni. This reduces
libandroid_runtime's dependency on libmedia, and results in
a net size reduction of the libraries involved.

Test: atest JetPlayerTest
Change-Id: I028c774fdea167924b064855267254c15f22fddb
Merged-In: I028c774fdea167924b064855267254c15f22fddb
2019-10-17 21:33:07 +00:00
Tobias Thierer
0935b64e5b Merge "Track MimeMap moving to libcore.content.type." am: 0801b7c222 am: 093c1e4eaa
am: b43f746cdc

Change-Id: Ib18214d3bd9a295a792025cae58102ebf187b0bf
2019-10-04 06:33:10 -07:00
Tobias Thierer
8edd837b79 Track MimeMap moving to libcore.content.type.
Another CL in this topic moves libcore.net.MimeMap to package
libcore.content.type. This CL updates associated references.

Bug: 136256059
Bug: 124232146
Test: Treehugger
Test: CtsMimeMapTestCases
Exempt-From-Owner-Approval: move affecting imports only
Change-Id: I30aac8b28a1740180ea01834a2bb66b61cb255d4
2019-10-04 12:52:38 +00:00
Dmitry Shmidt
567cb2b5cc Merge changes If9068025,I728e5bf9,I9d41169d am: 3b6a00ec3c am: 225b9d90c2
am: 3aadf0a4d9

Change-Id: I739f574365d36af6b37d47f5593b9ca14f26ef47
2019-10-02 15:21:10 -07:00
Nick Chalko
1f3ad554ad Add OWNERS for media/tv files
Change-Id: Ifeaed2ca3f6940541765ef1665aac23db7d358b5
Test: n/a
2019-09-27 14:42:40 -07:00
Dmitry Shmidt
3d23393159 AudioService: Add reporting of Mic Mute on start
Bug: 141192769
Test: Manual

Change-Id: I728e5bf9594622b7b80b640abd0f4938972d77ef
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2019-09-27 13:33:08 -07:00
Eric Laurent
e07f956e87 Merge "AudioTrack: fix default low power mode selection" into qt-qpr1-dev
am: 38dceceaf2

Change-Id: Iff06ef6996eb8f410432272ea44c6aa118fd2aa0
2019-09-13 12:54:50 -07:00
Eric Laurent
40f7e04f74 AudioTrack: fix default low power mode selection
Fix AudioAttributes flags checking logic in
shouldEnablePowerSaving() to take into account
flags that are compatible with deep buffer.

Bug: 140899988
Test: check that playback with Spotify goes to deep buffer
Change-Id: I492410b7837b15e248d61ec50dbb468e78e04524
2019-09-13 09:23:54 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
Xin Li
80860803a4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Kyeongkab.Nam
41c9e7092e Merge "Fix a lock issue in AudioPortEventHandler"
am: 0985eea389

Change-Id: If2113f4150e35c7aeb1751181dab8aa2ea05dee4
2019-08-11 18:38:44 -07:00
Treehugger Robot
0985eea389 Merge "Fix a lock issue in AudioPortEventHandler" 2019-08-12 01:22:58 +00:00