Commit Graph

8166 Commits

Author SHA1 Message Date
TreeHugger Robot
3082d6f971 Merge "Use TelephonyManager API to check if device is voice capable." 2019-12-13 21:26:25 +00:00
Automerger Merge Worker
c343a5e019 Merge "TIF: Add TvInputService#onHdmiDeviceUpdated()" am: efacbc6cc8 am: c08c2563cf am: c93513a768
Change-Id: Ibf313f658b0335b281dca4ec1cc5dc85322c3582
2019-12-13 10:39:42 +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
Nicholas Ambur
e0b8b8cd03 Merge "add SoundTrigger HAL 2.3 per model parameter apis" 2019-12-12 21:37:01 +00:00
Eric Laurent
b2b30e8639 Merge "audio: add call assistant usage" 2019-12-12 18:10:43 +00:00
Santiago Seifert
7d47a49673 Merge "Add pixel aspect ratio information to MediaFormat" 2019-12-12 12:33:51 +00:00
Michele
5dbecd9db3 Use TelephonyManager API to check if device is voice capable.
Bug: 146075164
Test: make
Change-Id: I3f19a65012ea355091bbbf22ee3c11054ed19e37
2019-12-12 00:10:19 -08:00
Nicholas Ambur
a0be6be387 add SoundTrigger HAL 2.3 per model parameter apis
add support for model parameter control APIs with THRESHOLD_FACTOR
as the first supported parameter

Bug: 141929369
Test: Tested manually with test app and confirmed with GTS test
gts-tradefed run gts-dev -m GtsAssistIntentTestCases
Change-Id: I06874fcf2ae2ef8796e7c52c4475252e8a026e2c
2019-12-11 19:16:48 -08:00
Eric Laurent
0eb901b79b audio: add call assistant usage
Add audio usage for call assistant use cases.
Used by apps playing over call uplink path for call
screening or other in call assitant features.
This usage is reserved for system apps with privileged permission
android.Manifest.permission.MODIFY_PHONE_STATE.

Bug: 135213843
Test: make
Change-Id: I7a2278f36f44a474a47dd85d276340da4df460f3
2019-12-11 21:38:52 +00:00
Santiago Seifert
c294a4720c Add pixel aspect ratio information to MediaFormat
Bug: 132153067
Bug: 134057371
Test: Not applicable.
Change-Id: I6369640e2b49350ef368c25820197281f3c30ae5
2019-12-11 11:27:46 +00:00
shubang
030afb56c8 Add DvrSettings
Test: make; cuttlefish;
Change-Id: Ia7e3199a4aa794dc41bf5d10f09fbf82b41b512f
2019-12-10 16:29:45 -08:00
Jean-Michel Trivi
21cd5413e0 Audio routing by strategy SystemApi
Routing is done per AudioProductStrategy. For instance routing
media is done by using the AudioProductStrategy that supports
the AudioAttributes with USAGE_MEDIA.
  Routing is for a connected device, AudioDeviceInfo, or for on a
device that is not currently connected, uniquely specified by
its role, type and address.
  Preferred routing can be set, removed, queried (get).
  When audioserver crashes, AudioService restores the preferred
routing operating on the audio policy engine.

Bug: 144440677
Test: atest AudioServiceHostTest#PreferredDeviceRoutingTest

Change-Id: I0647608088fe2906e78b71341615975a56747c2f
2019-12-10 09:23:24 -08:00
Santiago Seifert
3e59f30c2d Merge "MediaFormat: Add ENCODER_DELAY and ENCODER_PADDING" 2019-12-10 13:24:26 +00:00
Santiago Seifert
8095a83b37 MediaFormat: Add ENCODER_DELAY and ENCODER_PADDING
Note that these two already exist in NdkMediaFormat.

Bug: 132153067
Bug: 134057371
Test: Not applicable.
Change-Id: I602bd16e3cda302e538097a9a2ba3487f34fa0f9
2019-12-10 11:32:46 +00:00
TreeHugger Robot
46fcbd69e6 Merge changes from topic "tuner_api_filter_read"
* changes:
  Add read methods for filter
  Add a cpp filter wraper
  Filter settings and configure()
2019-12-09 21:39:29 +00:00
shubang
964e6137e0 Add read methods for filter
Test: make; cuttlefish;

Change-Id: Id04843051e2060eb6612643dff8f889f1266c1f2
2019-12-09 10:57:46 -08:00
Marco Nelissen
30fa0b895a Merge "Fix bad javadoc link" am: b002876a41 am: b6aaed3796
am: 1f20c66f56

Change-Id: Ia552668066598993fd00749f83c9a2880785f26c
2019-12-06 14:47:32 -08:00
Marco Nelissen
1f20c66f56 Merge "Fix bad javadoc link" am: b002876a41
am: b6aaed3796

Change-Id: Ic8767b6afc40789a6b6c11c20edc61ede8da3c87
2019-12-06 14:42:45 -08:00
shubang
75c870854c Filter settings and configure()
Test: make; acloud;
Change-Id: Idf5774b1b7d6fbd2e512c55abf5618ce26cc7965
2019-12-06 14:40:20 -08:00
Marco Nelissen
b002876a41 Merge "Fix bad javadoc link" 2019-12-06 22:30:15 +00:00
Eric Laurent
ad9ccbc39d Merge "Add explicit private audio recording request" 2019-12-06 19:21:53 +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
Jeffrey Huang
cb78285b81 Rename writeToProto to be dumpDebug
We want to eventually migrate some of these APIs to be @SystemApi for mainline modules.
The #dumpDebug name is more appropriate than #writeToProto.

Bug: 142279786
Test: Manual
Change-Id: I60793e91cedf6b720d4ecef6a8484f4fed4ff30f
2019-12-05 11:28:11 -08:00
Robert Shih
9064ede6ba Merge "MediaDrm: enumerate supported schemes" 2019-12-04 19:40:30 +00:00
Kyunglyul Hyun
86576714b9 MediaRouter: remove MR1 from MR2ServiceImpl
Thid CL is revert for ag/9402887.
That was to support seamless transfer in MR1 but we decided not to.

Test: atest mediaroutertest
Change-Id: I0ce76fbb11efc9b9892865085aa28010e2528b7b
2019-12-04 13:59:23 +09: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
Kyunglyul Hyun
f7d5e044a8 MediaRouter: send control hints from provider to client
This CL enables providers to send control hints to the clients
so connections can be established between clients and providers.

This CL also adds a hidden flag such that MR2 can notice whether
the route is selected by itself or MR2Manager.

Uses of Mockito is completely removed from the test for better test
environment.

Callbacks will be unregistered automatically when a test is
ended so there will be no unregistered callbacks remaining after
test failures.

Test: atest mediaroutertest
Change-Id: I1411bad3ddd7890fbf76020107f870daa2413077
2019-12-02 11:38:39 +09:00
Robert Shih
d2e8b43f6f MediaDrm: enumerate supported schemes
Bug: 139134043
Test: MediaDrmTest
Change-Id: If6f8c8afb7f96a424556638d6909ff0396f0612e
2019-11-27 18:53:49 +00:00
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
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
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