Commit Graph

8130 Commits

Author SHA1 Message Date
Hyundo Moon
6f2e8d4c33 Merge "Make MediaRouter2#getSelectedRoute() non null" 2019-11-22 01:43:58 +00:00
TreeHugger Robot
aa08a857c0 Merge "Refactor audio device type in audio frameworks." 2019-11-22 00:52:24 +00:00
jiabin
e1573108fe 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
2019-11-21 13:46:11 -08:00
Hyundo Moon
5736a614ec Make MediaRouter2#getSelectedRoute() non null
In the constructor of MediaRouter2, it gets system routes from
MediaRouterService.

Test: atest mediaroutertest:MediaRouter2Test
Change-Id: I26512343faefe11b353734184f0bbae566025b4b
2019-11-21 17:16:15 +09:00
Jean-Michel Trivi
10891d7809 Merge "AudioDeviceAddress: new class to store audio device information" 2019-11-20 18:20:17 +00:00
Kyunglyul Hyun
d3e53c5ec3 MediaRouter: Allow empty name for routes
I thought that routes with empty name are invalid and providers
shouldn't publish those.

BT devices seem to be able to have empty name, however, so we have
to choose between
 a) ignoring empty named bluetooth routes
 b) allowing empty named routes

If a BT device was invalid, BT or Audio should hide the device.
So even the name is empty, the route may be valid and we choose b).

Test: atest mediaroutertest
   && atest A2dpServiceTest

Change-Id: I9b4866711bc4f4c2c13e790519ea1f4d408fa5d1
2019-11-20 13:53:11 +09:00
Artur Satayev
785d3a03b9 Merge "Add @UnsupportedAppUsage annotations for greylist." 2019-11-19 15:05:51 +00:00
Artur Satayev
751e55114c 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.

This is partial merge of aosp/Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09. Telephony greylist cleanup has been done separately. Note that annotations outside of frameworks/base/ have been merged from AOSP.

Bug: 137350495
Test: m
Exempt-From-Owner-Approval: merge
Change-Id: I015c466e8b69cc0fed5e9d394ba865aad11d8ba6
2019-11-19 15:05:35 +00:00
Jin Seok Park
e19f8a61ca Merge "Return correct offsets for getAttributeRange()" 2019-11-19 09:58:03 +00:00
Shubang Lu
cbfe99ae3d Merge "Create Frontend settings classes and implement tune()" 2019-11-18 19:04:14 +00:00
Jin Seok Park
fc73f4d82c Return correct offsets for getAttributeRange()
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: Ib5e33335cfafa81e3584e96d49a764ad873835a9
2019-11-19 00:49:28 +09:00
Robert Horvath
070374046c Merge "Rename OWNER to OWNERS for media/tv" am: a4ff2b159f am: 16a5ce0026
am: 85e44e1976

Change-Id: I9de7cf1830720ce025e0e4aa73b2fa00f1fceffa
2019-11-18 01:14:27 -08: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
shubang
74bfd4893f Create Frontend settings classes and implement tune()
The fronetend.tune() method needs these settings

Test: make; acloud;
Change-Id: Ib5506f63074ac952e32a600aac5b8ad5f0da2ad1
2019-11-15 22:30:32 +00:00
Jean-Michel Trivi
6e9997ccd0 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
2019-11-15 10:00:03 -08:00
Jin Seok Park
47f8d08ab3 Merge "Change constructor for Exif data only streams" 2019-11-15 07:40:51 +00:00
shubang
4a0eddf4b8 DVR API: class, methods, JNI
Test: make; alcoud;
Change-Id: Iddcffef436dc520c969a3dc4f854e3d4c902c2b8
2019-11-14 10:47:29 -08:00
shubang
13f15e0caa Add Descrambler handling
Test: make;
Change-Id: I9df9080c97a2e3bf706587a81400afdf954538fe
2019-11-14 02:02:28 +00:00
Jin Seok Park
b09aed7cf6 Merge "Unhide Offset-related tags" 2019-11-14 01:15:18 +00:00
Shubang Lu
be3930b7d5 Merge "Add Lnb and callback" 2019-11-13 23:54:49 +00:00
Jeff Sharkey
8b3c10ac43 Merge "Canonicalize path before scanning." 2019-11-13 22:20:58 +00:00
Shubang Lu
698d365b0f Merge "Add filter start, stop, flush methods" 2019-11-13 21:57:03 +00:00
Jeff Sharkey
10b373b512 Canonicalize path before scanning.
Clients can pass paths like "/sdcard" which don't map directly to
a real storage volume.

Bug: 141837797
Test: none
Change-Id: Iec110472e224c381e33dc9f8e60e1b10e2fbfc0e
2019-11-13 14:01:57 -07:00
Hyundo Moon
fc6ad8d897 Merge "Add MediaRouter2#requestSelectRoute and related logics" 2019-11-13 10:06:17 +00:00
TreeHugger Robot
ac7ab34d71 Merge "MediaRouter2: Annotate nullability" 2019-11-13 08:45:48 +00:00
Jin Seok Park
583446742b Change constructor for Exif data only streams
Also improved Javadoc for constructors, including specifying
when exceptions are thrown.

Bug: 142347585, Bug: 144321109
Test: make update-api && Run cts test
Change-Id: I08b5725caa3d5af36b10425ef0b0b956a08e747e
2019-11-13 17:28:17 +09:00
Hyundo Moon
4140fee0b2 Add MediaRouter2#requestSelectRoute and related logics
Added following logics
 - MediaRouter2 does not select the route anymore, but 'requests'
   to the MediaRouter2Service.
 - The request is sent to the MediaRoute2ProviderService.
 - If the provider send the control hints, the route is now
   'selected'. (The method for sending hints is not included in this CL)
 - If the provider didn't send the control hints in timeout,
   the selection request is cancelled.

Tests for this CL will be added when we introduce a new method
MediaRoute2ProviderService#sendControlHints()
(method name is not final).

Test: Builds successfully
Change-Id: I5aafcc29f9d39a88bac05b8e8ebae1280ef1f8fc
2019-11-13 17:25:46 +09:00
shubang
d097790ac5 Add filter start, stop, flush methods
Test: make; acloud;
Change-Id: I3dbc8f305c998729deae4cf7c03135c8d3a0db93
2019-11-12 19:01:22 -08:00
Jin Seok Park
53b832e064 Unhide Offset-related tags
Bug: 143487312
Test: make update-api
Change-Id: I98db501883de3cf75b87781e8b9258aff4d177e0
2019-11-13 10:23:19 +09:00
shubang
760f031597 Add Lnb and callback
Test: make; acloud;
Change-Id: I49a7aa5dca353a26247e8e2d86fc9379f0b917d9
2019-11-12 17:14:09 -08: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
Eric Laurent
2d7197fca4 AudioManager: Add call screening audio mode.
Add new audio mode MODE_CALL_SCREENING allowing call screening
to take place while other audio use cases are still active.

Also add API to indicate if the platform supports this audio mode.

Bug: 140384450
Test: make
Change-Id: I056f79580d9c7b4de5eabb6d8d8c917f39162bcd
2019-11-11 17:38:27 -08:00
Eric Laurent
eb304570b1 Merge "AudioAttributes: Fix Builder.setFlags()" 2019-11-11 23:25:52 +00:00
Eric Laurent
84c74cd2ba Merge "AudioService: communicate audio HAL process pids to native audioserver" 2019-11-11 23:24:02 +00:00
Robert Shih
113ba88fa3 Merge "MediaDrm: remove Parcel from event listener impl" 2019-11-11 18:19:10 +00: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
Kyunglyul Hyun
4ed68757a7 MediaRouter2: Updates callback for MediaRouter2Manager
This CL updates callbacks for MediaRouter2Manager such that
onRoutesAdded, onRoutesRemoved are added and onRoutesChanged is changed.

onControlCategories also is added to know when getAvailableRoutes() can
be called.

It also updated tests for that and add some helper methods to test
easily.

Test: atest mediaroutertest

Change-Id: I122ce8f8472e01284f13b8aec79e3b8e97fc712b
2019-11-11 13:59:05 +09:00
Eric Laurent
d0c49687cd AudioAttributes: Fix Builder.setFlags()
AudioAttributes.Builder.setFlags() is a public method and should only
allow to set public flags

Test: CTS AudioAttributesTest
Change-Id: Ib75e3487f5297f6a200ffe326c53a0f58458b51f
2019-11-08 15:26:01 -08:00
Eric Laurent
4a5db4cd50 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
2019-11-08 22:41:47 +00:00
Robert Shih
9d4e2d48a3 MediaDrm: remove Parcel from event listener impl
Bug: 134787536
Test: MediaDrmClearkeyTest
Test: MediaDrmMockTest
Change-Id: I0ae07ed2477de0da53a3622d86adc106723c1acf
2019-11-08 13:55:37 -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
7687309a55 Merge "MediaCodec: Release lock before calling onFrameRendered()" am: c03b91a7ef am: 23b72c725c
am: a802a56b45

Change-Id: I2428e273bed9d458887c677f7391510e6f0461ed
2019-11-08 06:14:26 -08: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