Commit Graph

14614 Commits

Author SHA1 Message Date
Marco Nelissen
8d132dd384 Merge "Remove unused link libraries from libmedia_jni_utils" 2019-10-31 17:18:51 +00:00
Jiyong Park
f0cc2aa46f Merge "Build API stub with less number of source files" 2019-10-31 04:44:27 +00:00
Marco Nelissen
e83368fcfa Remove unused link libraries from libmedia_jni_utils
Test: build
Change-Id: If11573e26f1b4e610b936d63870da962c8e128a2
2019-10-30 07:48:25 -07:00
Jiyong Park
3c8f37f421 Build API stub with less number of source files
The metalava fix 09094fc5e566a380b7aa1a4c3948ac66cebc0aba allows us to
not include source files having class definitions that are referenced by
private constructors of the API classes.

Removing the now uncessary source files from the input list so that
metalava can run faster.

Bug: 141149570
Test: m
Change-Id: Ib203221600baa0e57393b0d448125676d01bcb8e
2019-10-30 13:25:35 +09:00
Treehugger Robot
c91c7ab339 Merge "Add OWNERS for media/tv files" 2019-10-29 22:31:08 +00:00
Marco Nelissen
00639037d7 Merge "Declare Visualizer::setEnabled() 'final'" 2019-10-29 14:31:55 +00:00
Treehugger Robot
149ad21fcd Merge "Add owners for TV related files" 2019-10-28 18:40:38 +00:00
Greg Kaiser
d4dd8b8edf Declare Visualizer::setEnabled() 'final'
We call the virtual method setEnabled() from Visualizer's
destructor.  In the destructor, the virtual binding is not used.
This isn't a problem for any current code, but to future-proof
against a possible future subclass of Visualizer, we declare
this method 'final'.

Test: TreeHugger
Change-Id: I703580b37cc1bf7f411caa723f95a691dff840a5
2019-10-28 08:02:29 -07:00
Marco Nelissen
0bf6a04b0b Merge "Move Visualizer to libaudioeffect_jni, its only user" 2019-10-26 01:45:57 +00:00
Marco Nelissen
1a7b415d53 Move Visualizer to libaudioeffect_jni, its only user
This removes libaudioeffect_jni's dependency on libmedia and removes
libmedia's dependency on libaudioutils.

Test: build
Change-Id: I23902cd1cc16b49200f41f79736683c89b9f86f8
Merged-In: I23902cd1cc16b49200f41f79736683c89b9f86f8
2019-10-25 20:35:30 +00:00
Marco Nelissen
04d8813a01 Merge "Add required header_libs" 2019-10-25 19:47:54 +00:00
Marco Nelissen
8844f0f8dd Add required header_libs
Test: build
Bug: 143245419
Change-Id: Idff0bf6cde9bc3e568d04c978f388be31963bc02
2019-10-24 21:25:59 +00:00
shubang
7608ba3819 Add owners for TV related files
Test: N/A
Change-Id: I4d6d6fbe6d2301cf685ca85e15ce88e898277632
2019-10-23 15:53:52 -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
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
Dongwon Kang
097fc5fe58 libmedia_jni: separate codeclist from libmedia
Test: build.
Bug: 139201422
Change-Id: I8d4279af883198e1276955831ecb9e3ae7a6e0af
Merged-In: I8d4279af883198e1276955831ecb9e3ae7a6e0af
2019-10-11 23:52:48 +00:00
Tobias Thierer
0801b7c222 Merge "Track MimeMap moving to libcore.content.type." 2019-10-04 12:54:17 +00: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
Marco Nelissen
46f3e8f929 Merge "Fix DRM includes" 2019-10-03 20:03:44 +00:00
Marco Nelissen
3495d4f857 Fix DRM includes
Test: build
Change-Id: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
Merged-In: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
2019-10-01 13:43:52 -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
Marco Nelissen
845fa76419 Remove MediaPlayer2
Bug: 141546997
Test: build, boot
Change-Id: I1550c14f3a0967910809cc2415d10f62c967bd44
Merged-In: I1550c14f3a0967910809cc2415d10f62c967bd44
2019-09-25 08:15:54 -07:00
Jiyong Park
b1d2701f76 Build java_sdk_libraries with much less sources
This change fixes a regression that java_sdk_libraries under
frameworks/base were built with all framework sources.

Bug: 141149570
Test: m
Change-Id: Iea1d2ae20ca1c5b514a52d8b2a22e8a1d7543efd
2019-09-17 23:17:47 +09:00
Jiyong Park
ae9972bda4 Use filter_packages to unbunden metalava
This change fixes a problem that entire framework source files are given
to metalava even when many of the source files are not for public. Using
the new property filter_packages, only source files that belongs to the
public packages are given to metalava.

This CL also changes the name of the filegroup 'framework-srcs' to
'framework-non-updatable-sources' to better describe its contents. In
addition, a build-time only library 'framework-all' is introduced. This
library produces a header jar for all framework sources for both
non-updatable and updatable parts. It is put to the classpath when
invoking metalava to give information on the hidden classes that were
filtered-out.

Bug: 140764681
Test: m
Change-Id: I6e16679109ac07820e35037754d4327442c014f2
2019-09-16 13:12:59 +09:00
Andy Hung
f1588f2694 SoundPool: Do not sleep on stop for USAGE_GAME or on BUFFER_END
Test: SoundPoolApplication, SoundPoolOggTest, Games
Bug: 139787914
Bug: 139788416
Bug: 140579743
Bug: 140779732
Merged-In: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
Change-Id: I83b9b1d61b65dcc4a73d676e1f8be1e022c70302
(cherry picked from commit a527524356)
2019-09-13 10:30:02 -07:00
Steven Moreland
0daed48a88 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I136e4d4459bb8c3c5abf3c0758dd5ae14d0ad2a2
2019-09-09 16:28:55 +00:00
Aurimas Liutikas
85c0a5a2be Merge "Add missing nullability annotations." into stage-aosp-master 2019-08-30 15:19:45 +00:00
Jiyong Park
5366ea2089 Cut the dependency to framework from droiddoc modules
droiddoc modules for the SDK API documentation and stubs library
generations have depended on the 'framework' (which was recently changed
to framework-minus-apex' module to get the list of Java source files to
be processed.

This however caused a circular dependency when we tried to modularize
some classes in the framework library as a separate library. The
separate java library depended on the stubs library (because it should
only use SDK APIs) and the stubs library depended on the framework
library. The framework library itself depended on the separated library
(or its stub) to use APIs from the separated library, thus forming a
circular dependency.

This change fixes the problem by directly giving the framework source
files via a filegroup `framework-sources-to-document` where all Java
and AIDL files that are to be documented are included in.

This change also put the generated R.java and Manifest.java files from
framework-res into the filegroup for framework sources.

Bug: 70046217
Bug: 135922046
Test: m

Exempt-From-Owner-Approval: Approved internally
Merged-In: I09ad88da47540d31ad089aad5e1151a4b6877ec2
(cherry picked from commit 20426538f8)
Change-Id: I09ad88da47540d31ad089aad5e1151a4b6877ec2
2019-08-30 05:14:08 +00:00
Jiyong Park
df6c25d518 Remove -without-aidls filegroups for the media apex.
When there is no *.aidl file in a filegroup, include path for the aidl
compiler is not set to the path property of the filegroup. This blocks
the plan to cut the dependency from API stubs libs to the framework,
because then we have to rely on the include paths deducted from the
input filegroups, rather than AIDL include paths exported from the
framework.

To make that happen, this change first removes the *-without-aidls
filegroups and replace the reference to them with the corresponding file
groups having AIDLs. Adding the AIDL files for media apex to the API
stubs is fine because the AIDL files are @hidden ones.

Bug: 70046217
Bug: 135922046
Test: m

Exempt-From-Owner-Approval: Approved internally
Merged-In: I794f6d0a7bcbef311d345d6e18ca311800af8ef4
(cherry picked from commit d2411f730f)
Change-Id: I794f6d0a7bcbef311d345d6e18ca311800af8ef4
2019-08-30 05:12:14 +00: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
Jiyong Park
7e1339e055 Use filegroup to simplify Android.bp for frameworks and its friends
Java and AIDL source files under frameworks/base are now modularized
using filegroup. Each filegroup has 'path' property set to the base
directory of the ssource files. This allows us to not rely on
aidl.[local_]include_dirs and srcs_lib_whitelist_dirs to get the base
directories.

Bug: 70046217
Test: m
Exempt-From-Owner-Approval: Approved internally
Merged-In: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
(cherry picked from commit b360931bf0)
Change-Id: I0705ddf76b3c628127f65d75e0a8b06c6c250fe2
2019-08-24 00:04:18 +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
Kyunglyul Hyun
a7a67d17b6 Merge "Add klhyun@ to media OWNERS"
am: 454029142c

Change-Id: Ifef678adceb8faeae1cc46b04a4a48ccf29c0924
2019-08-09 07:29:58 -07:00
Kyeongkab.Nam
6dbaaf2d8a Fix a lock issue in AudioPortEventHandler
It used "this" as a lock object to guard mListeners. but "this" is
pointing to mHandler in handler thread.
This causes the IndexOutOfBoundsException.

bug: 138951761
Test: manual
Change-Id: I826c7c68ecff4fc0d39addd3d56bc989e00848bc
2019-08-09 09:30:44 +09:00
Kyunglyul Hyun
45ec41fd08 Add klhyun@ to media OWNERS
Test: N/A
Change-Id: I4328217199581fcb181f74a5c3baabd3a9148136
2019-08-08 15:27:26 +09:00
Aurimas Liutikas
fbcbeec03c Merge "Fix broken Javadoc links in frameworks/base"
am: 4a532813df

Change-Id: I5a6152fa6baab86dde980af57b84167b154b44c7
2019-08-04 00:49:17 -07:00
Aurimas Liutikas
92ff83bddc Fix broken Javadoc links in frameworks/base
Test: running metalava with syntax check enabled.
Change-Id: I13ec355b591b0ae3cfb5009794b1ed844d27cba8
2019-08-02 15:40:29 -07:00
Marco Nelissen
292fdc1c93 Remove libexif usage from libmedia_jni.so
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
(cherry picked from commit f7ec16802c)
(cherry picked from commit efb865ace2)
(cherry picked from commit 5954d210d3)
2019-07-08 05:29:38 +00:00
Jaewan Kim
dde5c27a4c Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev
am: d1a84cb578

Change-Id: I4aa3b7fe6e10ae8d80ccbeec26818c157ccc4114
2019-07-03 17:44:55 -07:00
TreeHugger Robot
d1a84cb578 Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev 2019-07-03 21:59:30 +00:00
Marco Nelissen
efb865ace2 Remove libexif usage from libmedia_jni.so
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
(cherry picked from commit f7ec16802c)
2019-07-03 15:48:46 +00:00
Jaewan Kim
db90afdb78 Media2: Make Javadoc consistent for recommending use of AndroidX
Bug: 136602530
Test: Build docs offline and checked manually.
Change-Id: I70df7b05a6749b9ba492ac03cd3b9179a7416b9c
2019-07-03 14:55:55 +09:00
Marco Nelissen
8cef141941 Remove libexif usage from libmedia_jni.so
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
Merged-In: I33128db25b8aae60df7854c61fc2a3873a1bced9
2019-07-02 15:06:06 -07:00
Mathew Inwood
07f3dfc625 Merge "Restore some greylist entries." into qt-dev
am: 4c46902338

Change-Id: I1e1e60d2d47c24576ff8c9f41c0676e781348dbb
2019-06-28 23:32:29 -07:00
Mathew Inwood
36292fc9e2 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I6518440a7b0de8292ad05b4df9f0f9580d18b2a5
2019-06-28 09:21:36 +00:00