Automerger Merge Worker
a98ed95e38
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9 am: ad01553db3 am: 693186aa5f
...
Change-Id: I6b34597842307e13fbdb649191999dc17a1363f7
2020-05-04 10:01:49 +00:00
Bonian Chen
58fba2ee5d
[Settings] Crash avoidance am: 017cc4e48f am: 2e5af24106 am: 9835acb2e2 am: 66e2d57e49 am: fe42999d21
...
Change-Id: I7c9e72e1f37cd529db75423c95872a2e580cf1f0
2020-05-04 10:01:40 +00:00
Bonian Chen
4fb35aa209
[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: be8eba0d3c am: 81cf99b2c8 am: da07873848
...
Change-Id: I64cbdbdc13368d2d6761650aa6737081c5888b27
2020-05-04 10:01:33 +00:00
Automerger Merge Worker
693186aa5f
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9 am: ad01553db3
...
Change-Id: Id9c15e44517cb7752c9e8509e7ac4fa4845efde6
2020-05-04 09:39:46 +00:00
Bonian Chen
fe42999d21
[Settings] Crash avoidance am: 017cc4e48f am: 2e5af24106 am: 9835acb2e2 am: 66e2d57e49
...
Change-Id: Ie7ae49d27d65b196b5a228da1455712c9548acef
2020-05-04 09:39:37 +00:00
Bonian Chen
da07873848
[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: be8eba0d3c am: 81cf99b2c8
...
Change-Id: I4add4e3cecf4bf593fd2337ada98e5070ee0660d
2020-05-04 09:39:19 +00:00
Automerger Merge Worker
ad01553db3
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9
...
Change-Id: I1577ce02295337c512423cec6f4e94f42a16a19d
2020-05-04 09:28:45 +00:00
Bonian Chen
66e2d57e49
[Settings] Crash avoidance am: 017cc4e48f am: 2e5af24106 am: 9835acb2e2
...
Change-Id: Id0aa191878c854d06f0bf6ccbfcf5afa0d406a6d
2020-05-04 09:28:30 +00:00
Bonian Chen
81cf99b2c8
[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: be8eba0d3c
...
Change-Id: I4cf135f1f9441b23060ca692a67f99e12433018c
2020-05-04 09:28:15 +00:00
Automerger Merge Worker
99b7c321f9
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp
2020-05-04 09:14:47 +00:00
Bonian Chen
9835acb2e2
[Settings] Crash avoidance am: 017cc4e48f am: 2e5af24106
...
Change-Id: I921c1a2c413f6a34c867da128840b799d14fd906
2020-05-04 09:14:37 +00:00
tim peng
ef82018b68
Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03
...
Change-Id: Ida6ddf7e5635e9e9f578837dea209edfbc8151d6
2020-05-04 09:14:36 +00:00
Bonian Chen
be8eba0d3c
[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434
...
Change-Id: If14b3bcd1a908d9aa4f642cc0e2501140a244592
2020-05-04 09:14:28 +00:00
tim peng
8e81088c03
Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
...
Change-Id: I74eedc4056be20f794ad37962cc3ad2f7a1351fc
2020-05-04 09:02:38 +00:00
Bonian Chen
2e5af24106
[Settings] Crash avoidance am: 017cc4e48f
...
Change-Id: I042c1b5332c18c780400e7ea47f70eb44b597cfc
2020-05-04 09:02:21 +00:00
Bonian Chen
0f35750434
[Settings] Crash avoidance am: 017cc4e48f
...
Change-Id: Icc577b07a30bf31f5f745ebe4af2e526efb9ae6b
2020-05-04 09:02:12 +00:00
tim peng
1424b594c9
Merge "Modify rule of remote media session UI" into rvc-dev
2020-05-04 08:47:41 +00:00
Bonian Chen
017cc4e48f
[Settings] Crash avoidance
...
Avoid crash when NullPointer.
Bug: 155248992
Test: manual
Change-Id: I5e4b46dcdf7ff21713b3f77fc9e20f503800b8e2
2020-05-04 14:11:09 +08:00
Lucas Dupin
5511f7f46e
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: e1bcfeed31 am: 41ccc9f201 am: 04b13aba65 am: 0f417e9d09
...
Change-Id: I4931f43865494fd3e0410e1c76669e9eb85be6ae
2020-05-04 05:11:59 +00:00
Automerger Merge Worker
97c9ea39ca
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330 am: da63c1a4cf am: c594be9bee
...
Change-Id: I9b52c7c4dbddd396f3001b159854251e0bf100d3
2020-05-04 05:10:42 +00:00
Lucas Dupin
a1811f0c1c
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: d0e6d5421d am: f966f6449a am: ef6db613e2
...
Change-Id: I4fa1da1d5fa80645c8c4f869bd82e9708a05dfee
2020-05-04 05:10:23 +00:00
Lucas Dupin
0f417e9d09
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: e1bcfeed31 am: 41ccc9f201 am: 04b13aba65
...
Change-Id: I6451c58cf45128ae0509675ef09383273c759621
2020-05-04 04:52:58 +00:00
Automerger Merge Worker
c594be9bee
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330 am: da63c1a4cf
...
Change-Id: I779e1e36988a588c4fd60cae5beca6ed1f684099
2020-05-04 04:49:28 +00:00
Lucas Dupin
04b13aba65
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: e1bcfeed31 am: 41ccc9f201
...
Change-Id: Icda4bd5715bc2118aaf4d90cbccb358dd08f20c1
2020-05-04 04:48:49 +00:00
Lucas Dupin
ef6db613e2
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: d0e6d5421d am: f966f6449a
...
Change-Id: If04212840be902047e00bea9cb83ae3e399d07bf
2020-05-04 04:48:28 +00:00
Automerger Merge Worker
da63c1a4cf
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330
...
Change-Id: I28201d5da5101b3c829b35fa408c9e900828687b
2020-05-04 04:35:01 +00:00
Lucas Dupin
41ccc9f201
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: e1bcfeed31
...
Change-Id: Ic02ca7209c0c44f6f10e33ecc75020692cf99719
2020-05-04 04:34:19 +00:00
Lucas Dupin
f966f6449a
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: d0e6d5421d
...
Change-Id: I6c3bbe1a377680d2b83557a1b838bc5452409fc6
2020-05-04 04:34:19 +00:00
Tim Peng
e9b91f08c4
Modify rule of remote media session UI
...
-Add preference by remote session in Sound Setting
-Add slice item by remote session in Volume panel
-Replace media device data with media session data
-Add test case
Bug: 154918214
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1c873c9f99eebcba377f4115c4b9b4297b20c3d
2020-05-04 12:21:20 +08:00
Lucas Dupin
e1bcfeed31
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d
...
Change-Id: Ic2c9038ed28a38bdbb18144358f40eb37d5b236b
2020-05-04 04:18:43 +00:00
Automerger Merge Worker
50db25d330
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp
2020-05-04 04:18:33 +00:00
Lucas Dupin
477f3aa0f9
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2
...
Change-Id: Ibe8d53d3367f83fd6ea143d9ce85ced681b5d2f9
2020-05-04 04:18:28 +00:00
Lucas Dupin
d0e6d5421d
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d
...
Change-Id: I9cd6189b7386b4e0174911219b4fd31f1b8a2686
2020-05-04 04:18:17 +00:00
Lucas Dupin
8c568f2bc2
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
...
Change-Id: I9114fa317a937a6dd39eee4383988aa5dead582e
2020-05-04 04:08:22 +00:00
Lucas Dupin
c716801a8d
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
...
Change-Id: I5d785681b2833ecbf6ae43234e5a09315a2a4232
2020-05-04 04:07:54 +00:00
Lucas Dupin
7dc7252c15
Merge "Create QS media player setting" into rvc-dev
2020-05-04 03:59:28 +00:00
TreeHugger Robot
4d0e06ffc6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: b2ff994477 -s ours am: 297f9b73b8 -s ours am: 86379c0760 -s ours am: 71d3d9b4bd -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib000bbd7e3aa6e49b612f6231b0029a7b43a671c
2020-05-03 10:02:55 +00:00
TreeHugger Robot
e6ffc442c6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: 0cdef9683d -s ours am: bd0733edb3 -s ours am: c6910c2c34 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I107f5d046acbb3672cdf611e45741aa0167e92c0
2020-05-03 10:02:39 +00:00
TreeHugger Robot
71d3d9b4bd
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: b2ff994477 -s ours am: 297f9b73b8 -s ours am: 86379c0760 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I94b2be7241ba349e011339efa67a65a2d9ad6659
2020-05-03 09:51:54 +00:00
TreeHugger Robot
c6910c2c34
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: 0cdef9683d -s ours am: bd0733edb3 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie5e695b2b2cca18c11b0456c95b3bd0ea6476435
2020-05-03 09:51:32 +00:00
TreeHugger Robot
86379c0760
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: b2ff994477 -s ours am: 297f9b73b8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib8422a93e401b344cc44008a5294662c7e5ea838
2020-05-03 09:51:23 +00:00
TreeHugger Robot
b8f0d54ee5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours am: 2fe0bc5526 -s ours am: 4f72bfca53 -s ours am: e53cf845d9 -s ours am: af8a4dbd13 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifabfa2d605eb2a342783a5aafe3e1ad407b596fa
2020-05-03 09:31:02 +00:00
TreeHugger Robot
7840a0d9b4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours am: 8f0e6f5447 -s ours am: cf308b3a4c -s ours am: 8910479445 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id1d4fe701c1b0494e10107d6dbe7cc19b74b6277
2020-05-03 09:30:47 +00:00
TreeHugger Robot
bd0733edb3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: 0cdef9683d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Idf3db9c9002f2e1dff58b78b2306f6c5d60af3ca
2020-05-03 09:30:43 +00:00
TreeHugger Robot
297f9b73b8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours am: b2ff994477 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8f75a012e0275c0823eb5e7de9a33bdf05d6e761
2020-05-03 09:30:30 +00:00
TreeHugger Robot
af8a4dbd13
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours am: 2fe0bc5526 -s ours am: 4f72bfca53 -s ours am: e53cf845d9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I96ca5142b2bfc52b25e5bc0d17b7b18df35f2a4d
2020-05-03 09:16:18 +00:00
TreeHugger Robot
b2ff994477
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4f235712e92d9d82c2ae8a57fb593149a4caf8a7
2020-05-03 09:16:12 +00:00
TreeHugger Robot
8910479445
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours am: 8f0e6f5447 -s ours am: cf308b3a4c -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4890a0dfdd2987858b530f84523f1f002860b835
2020-05-03 09:16:06 +00:00
TreeHugger Robot
0cdef9683d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1c753b546fbb61ddbd993385839805b8d3e23385
2020-05-03 09:16:05 +00:00
TreeHugger Robot
e53cf845d9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours am: 2fe0bc5526 -s ours am: 4f72bfca53 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I06765e70f414bbdd9670d769fd873ea16597b90a
2020-05-03 09:02:06 +00:00
