Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557,201 Commits 3 Branches 0 Tags
28362be3fb24baba82c9cea98ebc5f908d52ab91
Commit Graph

16505 Commits

Author SHA1 Message Date
Hyundo Moon
9be2ccff43 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb am: e0d455c9d4 am: 5845a64988 am: 7a6d94dd82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: I95af1c544c5124123c19093d678126a8a526cb4b
 2020-06-12 06:15:46 +00:00
Hyundo Moon
7a6d94dd82 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb am: e0d455c9d4 am: 5845a64988 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: I299806a7a34f11eaf61c289d559c593747c102b8
 2020-06-12 06:02:39 +00:00
Hyundo Moon
6d8d91dcfb Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev 2020-06-12 05:23:25 +00:00
Hyundo Moon
369be956e0 MediaRouter2: Prevent printing same logs from different lines 
This CL prevents duplicate logs which are printed from
different code locations, which makes investigating future bugs easier.
Also modifies some logs to make them clearer.

Bug: 157873330
Test: Builds successfully
Change-Id: I90ca0e6b46e2b796d069dbecef4a8000cca85b4b
 2020-06-12 11:28:13 +09:00
Kyunglyul Hyun
4ce2d636aa Merge "Add address to MediaRoute2Info" into rvc-dev am: 55e5ac8fc0 am: 60031d4eb4 am: ddaece61e6 am: 0fc6290551 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11822778

Change-Id: I22292455c6217e105838bf0d9f1d277d27452901
 2020-06-11 11:51:58 +00:00
Kyunglyul Hyun
60031d4eb4 Merge "Add address to MediaRoute2Info" into rvc-dev am: 55e5ac8fc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11822778

Change-Id: I01d880fb5fa471b6b7e80cb97906dede5c43d4b4
 2020-06-11 10:56:05 +00:00
Kyunglyul Hyun
55e5ac8fc0 Merge "Add address to MediaRoute2Info" into rvc-dev 2020-06-11 10:53:55 +00:00
Hyundo Moon
5015aada0b Merge "Prevent abuse of MediaRoute2ProviderService#notifyRequestFailed()" into rvc-dev am: f3ff3de37e am: bc36ec31cd am: ebb913c929 am: 358b726fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788495

Change-Id: I17f6173e8b8a2d9a004042b8efdfd96940cd2626
 2020-06-11 01:47:19 +00:00
Hyundo Moon
358b726fab Merge "Prevent abuse of MediaRoute2ProviderService#notifyRequestFailed()" into rvc-dev am: f3ff3de37e am: bc36ec31cd am: ebb913c929 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788495

Change-Id: I199f38672c5d747ddec52f1733c5ed329204058c
 2020-06-11 01:23:52 +00:00
Hyundo Moon
49b01ec14c Merge "Prevent abuse of MediaRoute2ProviderService#notifyRequestFailed()" into rvc-dev am: f3ff3de37e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788495

Change-Id: I8fd3f269be7d0224ba83b0fd83a5ea13b27a624b
 2020-06-11 01:15:14 +00:00
Hyundo Moon
f3ff3de37e Merge "Prevent abuse of MediaRoute2ProviderService#notifyRequestFailed()" into rvc-dev 2020-06-11 01:10:25 +00:00
Hangyu Kuang
135afe2d7d Merge "Transcoding: Test api with actual service." 2020-06-10 21:25:36 +00:00
Ytai Ben-tsvi
037429a71a Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 am: 0cc8dbca10 am: e637e1212b am: ed1835f3b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I6827e6a7aa16ea1a21d79a2cf9c0a45f9fe85173
 2020-06-10 20:03:59 +00:00
Ytai Ben-tsvi
ed1835f3b0 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 am: 0cc8dbca10 am: e637e1212b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I46357e2d4872ef2346177be8df155fd91d22f26b
 2020-06-10 19:48:05 +00:00
Ytai Ben-tsvi
72daaeb263 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev am: 3917b729a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11815381

Change-Id: I6fec22000cbf048a1532afe951c5e2f7b495c921
 2020-06-10 19:38:52 +00:00
Ytai Ben-tsvi
3917b729a6 Merge changes Ibf4ecdb4,I1e4adf9f into rvc-dev 
* changes:
  Correctly propagate service state change
  Support null audio format in recognition event
 2020-06-10 19:31:42 +00:00
Kyunglyul Hyun
1ea19b1d01 Add address to MediaRoute2Info 
The route ID of a bluetooth route was its hardware address and
SettingsLib depended on that to get BluetoothDevice.

We can't use the address as ID for a pair of hearing devices,
which has their own address but should have the same route ID.

Instead, this CL adds "address" field explictly to be used for bluetooth
routes.
Maybe it can be used by other devices as well.

Bug: 157708273
Test: make -j42 RunSettingsLibRoboTests && cts test
Change-Id: Ib940da9975fc8d68ec3fb7cf2c4a85c0d1a195f3
 2020-06-10 20:59:15 +09:00
hkuang
3b285d600d Transcoding: Test api with actual service. 
Also adding the new start/pause/resume handling in
client callback.

Bug: 145628554
Test: Build
Change-Id: Ie059a57b4d2552067df0cecb512e1fbabc683037
 2020-06-09 23:26:08 +00:00
Ytai Ben-Tsvi
7caef40ad0 Support null audio format in recognition event 
The audio format doesn't always make sense in recognition events, for
example in a failure or abort event, so we allow it to be null.
However since the SoundTrigger.java API doesn't allow that, we inject
a default if it is not available.

Bug: 157496890
Test: Simulated a device that doesn't support concurrent capture,
      reproduced the bug, applied the fix, verified.
Change-Id: I1e4adf9f3ccdc0f62cb9ca5e8c07df3c40a9d2cd
 2020-06-09 16:05:19 -07:00
TreeHugger Robot
c86b533e57 Merge "media: further resource cleanup for async release" into rvc-dev am: 275248ddfe am: 46bc5d070e am: 50d0b096cb am: 86bbd07325 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795061

Change-Id: I076593827131a1592a2efec203c6e7d39d0074d5
 2020-06-09 18:22:51 +00:00
TreeHugger Robot
50d0b096cb Merge "media: further resource cleanup for async release" into rvc-dev am: 275248ddfe am: 46bc5d070e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795061

Change-Id: I6d09bc03949f40b01d29b6934ca975159105d1ed
 2020-06-09 17:48:03 +00:00
TreeHugger Robot
30ffcd3b58 Merge "media: further resource cleanup for async release" into rvc-dev am: 275248ddfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795061

Change-Id: I876014f6c9cb805595afbfa79aaf0d5945177ebe
 2020-06-09 17:46:18 +00:00
TreeHugger Robot
275248ddfe Merge "media: further resource cleanup for async release" into rvc-dev 2020-06-09 17:41:01 +00:00
Hyundo Moon
9b5e3923d1 Prevent abuse of MediaRoute2ProviderService#notifyRequestFailed() 
The method can be called with a random requestId, or called multiple
times with the valid requestId. It can result unnecessary calls
to MediaRouter2Manager#onRequestFailed().

This CL resolves this problem.

Bug: 157873556
Test: Passes CTS and mediaroutertest
Change-Id: Ia7dd4ddafd532b9f23bf19491a0820d5a74f6a70
 2020-06-09 19:12:30 +09:00
Hyundo Moon
d213fa18fd Merge "MediaRouter2: Add missing synchronized(sRouterLock) block" into rvc-dev am: 5aacc569c7 am: 7c4fbecb8d am: 6176bc0f6f am: ecbdcbd5f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11782206

Change-Id: I439e6c30f2d0a499095284bdb017988c4dbb9e59
 2020-06-09 06:47:46 +00:00
TreeHugger Robot
b24b900ac6 Merge "Add MediaRouterManager.Callback#onSessionReleased" into rvc-dev am: 2950ebf07d am: b18e625b5b am: ca6780f98d am: ec6933933f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733425

Change-Id: Ic22a601711db1abefa231a2251dc323ad7ee6b80
 2020-06-09 06:45:45 +00:00
Hyundo Moon
6176bc0f6f Merge "MediaRouter2: Add missing synchronized(sRouterLock) block" into rvc-dev am: 5aacc569c7 am: 7c4fbecb8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11782206

Change-Id: I7695f4fbade4abf0ee22890c632e63fb9ebcf2a3
 2020-06-09 06:44:41 +00:00
Hyundo Moon
84a06dbe0b Merge "MediaRouter2: Add missing synchronized(sRouterLock) block" into rvc-dev am: 5aacc569c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11782206

Change-Id: I5cb99d76f8f7e38a6f3a03b18ec948c00bf34799
 2020-06-09 06:44:30 +00:00
Hyundo Moon
5aacc569c7 Merge "MediaRouter2: Add missing synchronized(sRouterLock) block" into rvc-dev 2020-06-09 06:40:51 +00:00
TreeHugger Robot
b18e625b5b Merge "Add MediaRouterManager.Callback#onSessionReleased" into rvc-dev am: 2950ebf07d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733425

Change-Id: I720ea5577814b17bfcfc705585af154566367a59
 2020-06-09 06:21:39 +00:00
TreeHugger Robot
2950ebf07d Merge "Add MediaRouterManager.Callback#onSessionReleased" into rvc-dev 2020-06-09 06:10:19 +00:00
Kyunglyul Hyun
fe7b5b125b Add MediaRouterManager.Callback#onSessionReleased 
Add the callback to let MediaRouter2Manager get notified
of released sessions.
A test is also added to check if the manager is aware of
a released session when the session is released from the
media router.

Bug: 157872573
Test: atest mediaroutertest
Change-Id: Ifb96b23ed61cc15f5015c453727a487c3b09a92b
 2020-06-09 13:13:30 +09:00
Wonsik Kim
d4ce4e3074 media: further resource cleanup for async release 
Bug: 158158088
Test: atest CtsMediaTestCases:MediaCodecCapabilitiesTest#testGetMaxSupportedInstances
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Ie8ab527516836624837c96fa4fdae4dcffe18f43
 2020-06-08 11:58:16 -07:00
Automerger Merge Worker
ed235ea296 Merge "Merge "Adding lock to sendEventFromNative" into rvc-dev am: 50980050a6 am: 6d69fa96d8 am: 3533bd565d" into rvc-qpr-dev-plus-aosp am: ba1b90fa5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11720016

Change-Id: I0d61bf930dbca126c78079a1c5accbf5812cc9b3
 2020-06-08 17:12:59 +00:00
Hayden Gomes
3533bd565d Merge "Adding lock to sendEventFromNative" into rvc-dev am: 50980050a6 am: 6d69fa96d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11720016

Change-Id: I3c012c18cb12b48151eec66836dc2f9125b96fc4
 2020-06-08 16:25:27 +00:00
Hayden Gomes
98989f06d1 Merge "Adding lock to sendEventFromNative" into rvc-dev am: 50980050a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11720016

Change-Id: I25f6ccaf6adca626b32d83b366984f69654fd71c
 2020-06-08 16:11:24 +00:00
Hayden Gomes
50980050a6 Merge "Adding lock to sendEventFromNative" into rvc-dev 2020-06-08 16:02:49 +00:00
Automerger Merge Worker
ae79bcf807 Merge "Merge "Ignore transfer to an unknown route" into rvc-dev am: e3767bdaae am: a33170d2b5 am: 356b62dd4f" into rvc-qpr-dev-plus-aosp am: b43cdd6303 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700107

Change-Id: I667497c83220c996a65a626becb010841642ceb0
 2020-06-08 12:32:58 +00:00
TreeHugger Robot
d3c0fedad9 Merge "Notify a failure on transfer timeout" into rvc-dev am: 6b1cfced63 am: 71012d52b0 am: bb872b6184 am: 5e3172ec68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716082

Change-Id: I606dc3daf38dbe160139c1ba6abbffa4ce2d95b8
 2020-06-08 12:30:55 +00:00
TreeHugger Robot
d941e4ee91 Merge "Ignore transfer to an unknown route" into rvc-dev am: e3767bdaae am: a33170d2b5 am: 356b62dd4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700107

Change-Id: I4d2308cb7b19927d27980c16b32c2e23c4282a32
 2020-06-08 12:13:38 +00:00
TreeHugger Robot
5e3172ec68 Merge "Notify a failure on transfer timeout" into rvc-dev am: 6b1cfced63 am: 71012d52b0 am: bb872b6184 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716082

Change-Id: I97a825a488b3663e7599cd8a9659c14d04856a0b
 2020-06-08 12:13:19 +00:00
TreeHugger Robot
6e5412a434 Merge "Ignore transfer to an unknown route" into rvc-dev am: e3767bdaae am: a33170d2b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700107

Change-Id: Ib982bd4d48d9c362b3d605881c4e4d6937130b06
 2020-06-08 12:01:39 +00:00
TreeHugger Robot
c8eb5575d9 Merge "Notify a failure on transfer timeout" into rvc-dev am: 6b1cfced63 am: 71012d52b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716082

Change-Id: I8abc0cc6e4a3c38b48288282ccdc4dfdd0f96858
 2020-06-08 12:01:29 +00:00
TreeHugger Robot
710ada644e Merge "Ignore transfer to an unknown route" into rvc-dev am: e3767bdaae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700107

Change-Id: I5a6985ebb8a40fafe32d2a45cfd3baffe9868a83
 2020-06-08 11:49:04 +00:00
TreeHugger Robot
240637a450 Merge "Notify a failure on transfer timeout" into rvc-dev am: 6b1cfced63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716082

Change-Id: I4c6ba02ea002b1790be2de1c652416548010c7c1
 2020-06-08 11:48:27 +00:00
TreeHugger Robot
e3767bdaae Merge "Ignore transfer to an unknown route" into rvc-dev 2020-06-08 11:34:35 +00:00
TreeHugger Robot
6b1cfced63 Merge "Notify a failure on transfer timeout" into rvc-dev 2020-06-08 11:34:13 +00:00
Automerger Merge Worker
3146a87c4c Merge "Merge "MediaRouter2: Sync routes when first RouteCallback is registered" into rvc-dev am: ebb7ae6679 am: 813d77ae44 am: ed1f83f8af" into rvc-qpr-dev-plus-aosp am: d61e677f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733427

Change-Id: I13919f35eecc30265257c4fc9c2b1f1cf4971948
 2020-06-08 07:09:43 +00:00
Hyundo Moon
e89d363de4 Merge "MediaRouter2: Sync routes when first RouteCallback is registered" into rvc-dev am: ebb7ae6679 am: 813d77ae44 am: ed1f83f8af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733427

Change-Id: I8a39842e2d022fa178ce027d050a22fe1705275d
 2020-06-08 06:54:57 +00:00
Hyundo Moon
23a9e17874 MediaRouter2: Add missing synchronized(sRouterLock) block 
Bug: 157873496
Test: Builds successfully
Change-Id: I87882c642bcdd93a2fedd9ad2c6c5dc54eada598
 2020-06-08 15:48:56 +09:00