Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
509,407 Commits 3 Branches 0 Tags
05b0ccb2ec7cb235a4e96d2b04bbfba8bd65ca64
Commit Graph

8949 Commits

Author SHA1 Message Date
TreeHugger Robot
b8e0bafbd5 Merge "Reset app routes when global a2dp state changed" into rvc-dev am: 70b9d348eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833779

Change-Id: If3a14335833a78b0306d0f3fa9bcdd15820697c1
 2020-06-12 07:02:56 +00:00
TreeHugger Robot
70b9d348eb Merge "Reset app routes when global a2dp state changed" into rvc-dev 2020-06-12 06:37:46 +00:00
Hyundo Moon
a6760a6ce0 Merge "MediaRouter2: Prevent printing same logs from different lines" into rvc-dev am: 6d8d91dcfb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835420

Change-Id: Ifcdc722cd1a581846012a0406f04821e8f398d1a
 2020-06-12 05:31:32 +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
Sungsoo Lim
07e40316f8 Reset app routes when global a2dp state changed 
Bug: 156549746
Test: manual
Change-Id: I8985136220c9cb96bd4da013653a69f12bfbb6b1
 2020-06-12 12:13:08 +09: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
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
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
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
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
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
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
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
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
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
Hyundo Moon
d35c1381c7 Merge "MediaRouter2: Sync routes when first RouteCallback is registered" into rvc-dev am: ebb7ae6679 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11733427

Change-Id: I0fcbf3c186f7d3647d0e08fb64492e03c8bd1ae7
 2020-06-08 06:20:54 +00:00
Hyundo Moon
ebb7ae6679 Merge "MediaRouter2: Sync routes when first RouteCallback is registered" into rvc-dev 2020-06-08 06:07:31 +00:00
Hayden Gomes
14e3bd0c3e Adding lock to sendEventFromNative 
Eliminate potential race condition for postEventFromNative.

Fixes: 157755647
Test: atest com.android.car where race condition was hit
Change-Id: I5d11f8769d2c09a6a630332db447302e06a5869b
 2020-06-05 10:15:42 -07:00
Kyunglyul Hyun
8df5fb6e7d Notify a failure on transfer timeout 
When a transfer is ignored by the provider.
It is handled as a failure by MediaRouter2Manager.

A test is added for timeout, which takes 30 seconds.

Bug: 157875723
Test: atest mediaroutertest
Change-Id: I3f0ec77551309c96f8f589057800082f6121d4e2
 2020-06-05 18:22:42 +09:00
Hyundo Moon
bc63327359 MediaRouter2: Sync routes when first RouteCallback is registered 
Bug: 149526397
Test: Passed CTS and mediaroutertest
      Also checked logs that DEFAULT_ROUTE is not added.
Change-Id: Icc0a5f2ea8f93fd7baba132a9bd4a1f9d798bba9
 2020-06-05 17:38:04 +09:00
Automerger Merge Worker
7daf2ca947 Merge "Merge "Fix TvRecordingClient api issues" am: cce2ca958e am: f7cbbae9e4" into rvc-dev-plus-aosp am: 14bd7ccbb0 am: f9061f953d am: 4276a00208 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/972628

Bug: 134042967

Change-Id: Ib3ca9467b68563383fef4dbc0f11b0f4aa8fd111
(cherry picked from commit 69244518dd)
 2020-06-05 05:01:31 +00:00
Jay Patel
9619c74c12 Merge "Fix TvRecordingClient api issues" am: cce2ca958e am: f7cbbae9e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/972628

Change-Id: Ibea39cfbea0ebdd4d1bd087d9faccb5847d45d4b
 2020-06-05 03:35:36 +00:00
Jay Patel
f7cbbae9e4 Merge "Fix TvRecordingClient api issues" am: cce2ca958e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/972628

Change-Id: Idf510533785e6bd513480c283648666c29ec7847
 2020-06-05 03:16:30 +00:00
Baohe.Wang
c46177f00f Fix TvRecordingClient api issues 
Bug: 134042967

Change-Id: I457c9a2f70641ea174bddb236b855f2d7b7acecb
 2020-06-05 02:43:45 +00:00
Henry Fang
ed3627e6fb Merge changes I9f8ce2e5,I3142b073 into rvc-dev am: 084e7473fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689890

Change-Id: I6b826d23b50378f71311ef066c0b8a30833b089c
 2020-06-04 17:24:01 +00:00
Henry Fang
084e7473fb Merge changes I9f8ce2e5,I3142b073 into rvc-dev 
* changes:
  Add the metrics for status of open cas session
  Add the metrics for DVR status
 2020-06-04 17:18:14 +00:00
Kyunglyul Hyun
6ae4d803ea Merge "Fix MediaRoute2ProviderService TODOs" into rvc-dev am: 0eadc17150 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11675389

Change-Id: I4f1ad6b01723c8e5c0f5550eb9fa9261edb2c2ed
 2020-06-04 07:15:43 +00:00
Kyunglyul Hyun
0eadc17150 Merge "Fix MediaRoute2ProviderService TODOs" into rvc-dev 2020-06-04 07:05:29 +00:00
Henry Fang
fd40c07abe Add the metrics for status of open cas session 
Metrics review request:  b/155199791
Metrics design review is updated at https://eldar.corp.google.com/assessments/937523088/drafts/927800491

bug: 154661158
Test: Manual
Change-Id: I9f8ce2e52289130f9fb39a368240676c1792c154
 2020-06-03 12:38:03 -07:00
Henry Fang
1ae85bb287 Add the metrics for DVR status 
Metrics review request:  b/155199791
Metrics design review is updated at https://eldar.corp.google.com/assessments/937523088/drafts/927800491

bug: 154661158
Test: Manual
Change-Id: I3142b0737f7469a79a526281b75a06d3dbf97483
 2020-06-03 12:31:00 -07:00
Kyunglyul Hyun
a3be2de6ec Ignore transfer to an unknown route 
This CL ignores attempts to transfer to unknown route in
MediaRouter2Manager.
This CL also fixes wrong acquisition of locks when getXXXRoutes.

Bug: 157875504
Test: atest mediaroutertest
Change-Id: Ic3415844551c672b42d19d9744d7538a9d7df7c3
 2020-06-03 18:04:18 +09:00
Jing Ji
12e0ba732c Merge "Update docs for MediaProjectionManager.getMediaProjection" into rvc-dev am: 322b748b8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11683095

Change-Id: I63addfc54737e0d426b4df888a31c5e23d8a37c2
 2020-06-02 19:27:00 +00:00
Jing Ji
322b748b8d Merge "Update docs for MediaProjectionManager.getMediaProjection" into rvc-dev 2020-06-02 19:12:49 +00:00
Jing Ji
fd7b013f71 Update docs for MediaProjectionManager.getMediaProjection 
It actually needs the foregroud service to be the type "mediaProjection"

Bug: 157265923
Test: m -j ds-docs-java
Change-Id: Ia5aab928be1755e3117432bdec423e88f997c55b
 2020-06-02 10:39:46 -07:00
Kyunglyul Hyun
d344655969 Fix MediaRoute2ProviderService TODOs 
This CL ignores requests that contain unknown session IDs and
make sure sequence of binder calls are aligned with notifySession
Created/Updated/Released.

Bug: 157873546
Bug: 157873487
Test: Run CTS and atest mediarouter test
Change-Id: Ie31e2fca8160093cf54886180e67d40865a35d6d
 2020-06-02 17:32:57 +09:00
Hyundo Moon
a93451b509 Merge "Add bug numbers for TODOs in MediaRouter2 related classes" into rvc-dev am: 5c8f3b20d5 
Original change: undetermined

Change-Id: I441f51b100a3b7aa5d17e9199ae0e9c122695d64
 2020-06-02 08:27:35 +00:00
Hyundo Moon
5c8f3b20d5 Merge "Add bug numbers for TODOs in MediaRouter2 related classes" into rvc-dev 2020-06-02 08:16:58 +00:00
James Wei
5667f0d272 Merge "use updated mStorage for new MtpObject when copy file between storages" am: 587620cc62 am: 7c7680f261 
Original change: undetermined

Change-Id: I55cee281ffbd62bee688831844d3f2b071666e4c
 2020-06-02 06:51:36 +00:00