Automerger Merge Worker
5be72d4834
Merge "Make MediaParser match ExoPlayer's sniffing order" into rvc-dev am: 2c89e32d34 am: cb364464fc
...
Change-Id: Ie77a640076537ceb45da1152d6e5aace8164a588
2020-02-25 18:48:18 +00:00
Automerger Merge Worker
a717dac203
Merge "Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e am: ec490f0812" into rvc-d1-dev-plus-aosp
2020-02-25 18:48:15 +00:00
Automerger Merge Worker
f12cb32dc6
Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e am: ec490f0812
...
Change-Id: I07d951fa48c91247b29919d2e7bf6839c57e90c5
2020-02-25 18:48:07 +00:00
Automerger Merge Worker
93f651a682
[automerger skipped] Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949 am: 1a4dbf39f8 -s ours
...
am skip reason: Change-Id I779aa12bea633cee755aba46231e1b8c8e67b2cd with SHA-1 4a728ca2e5
2020-02-25 18:48:03 +00:00
Automerger Merge Worker
c3b50d13d0
Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932cb am: 0f5423398f
...
Change-Id: I174b03c1b2e8d1395f3c19e66432180637d807d8
2020-02-25 18:47:58 +00:00
Automerger Merge Worker
d37a0ae5d1
Tablet-specific UI updates to user switcher. DO NOT MERGE am: 2724b00212 am: 207d0a89b5
...
Change-Id: I6fb92840ea7a5bd6aa202dc2415d8287a4d944cf
2020-02-25 18:47:56 +00:00
Automerger Merge Worker
9e7bf0d03d
Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043 am: 91a0be4e2d
...
Change-Id: I0dd2164e2886acf342ed57f2725f4a883d1b03db
2020-02-25 18:47:43 +00:00
Automerger Merge Worker
74274f374a
Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949 am: 4ceb914202
...
Change-Id: I4be845b340ad455c598e28426175cfe792eff651
2020-02-25 18:47:28 +00:00
Automerger Merge Worker
d8342fc954
Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d am: 4230ed12d1
...
Change-Id: I17000e834610707ac5e6eb6045946da36d7b29fd
2020-02-25 18:47:22 +00:00
Automerger Merge Worker
b49a99ae6a
Merge "Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043 am: 3c642347c5" into rvc-d1-dev-plus-aosp
2020-02-25 18:47:07 +00:00
Automerger Merge Worker
e7fcc79985
Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043 am: 3c642347c5
...
Change-Id: I122287c3d281bf71bfac600229e107acf9b5052e
2020-02-25 18:47:02 +00:00
Automerger Merge Worker
44899ea826
Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 am: 44dc451f44
...
Change-Id: If2ffad20aa3cc4597a40a5c9e6b5b150f0c235e0
2020-02-25 18:46:57 +00:00
Automerger Merge Worker
c542e66e4c
Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d am: f0e36ac714
...
Change-Id: I9bcc98e0e8af5e7f27977a1fdbfbd54f6a475477
2020-02-25 18:46:40 +00:00
Automerger Merge Worker
d1884a620e
Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6 am: f84af9e79a
...
Change-Id: I7fa52e335427d0fa537a3ded4b9f2a93ed27be74
2020-02-25 18:46:00 +00:00
Automerger Merge Worker
cb364464fc
Merge "Make MediaParser match ExoPlayer's sniffing order" into rvc-dev am: 2c89e32d34
...
Change-Id: I50f939a7eda6e02c0980f52e71b7eb041e59c7cf
2020-02-25 18:34:20 +00:00
Automerger Merge Worker
ec490f0812
Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e
...
Change-Id: I2f9cdcd1a2d969b5ff416e0d2db1b1c3a71cac56
2020-02-25 18:33:44 +00:00
Automerger Merge Worker
1a4dbf39f8
Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949
...
Change-Id: I123ffdbc7f5448f12ef101dc30d43214a96241d0
2020-02-25 18:33:32 +00:00
Automerger Merge Worker
91a0be4e2d
Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043
...
Change-Id: I4f4245e81e82dbb44d43d6d5c67c71e317bc4d01
2020-02-25 18:33:16 +00:00
Automerger Merge Worker
0f5423398f
Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev am: 7def6932cb
...
Change-Id: Ie5c70d3413db641e292f93cb12c235efa8e83ae4
2020-02-25 18:33:12 +00:00
Automerger Merge Worker
207d0a89b5
Tablet-specific UI updates to user switcher. DO NOT MERGE am: 2724b00212
...
Change-Id: I9f3bdc5f85fdc5bb4885efd813ec6337124d4f2a
2020-02-25 18:33:10 +00:00
Automerger Merge Worker
4ceb914202
Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949
...
Change-Id: I614e0c371e89de3ab3be1f36cae3e180e28bc992
2020-02-25 18:32:48 +00:00
Automerger Merge Worker
4230ed12d1
Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d
...
Change-Id: I6cefa46725e200f33ba92b7505b3a0d699694deb
2020-02-25 18:32:41 +00:00
Automerger Merge Worker
3c642347c5
Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev am: 282b5c2043
...
Change-Id: I1e973f3f484967234cf24fecbda06fd1df50c15b
2020-02-25 18:32:19 +00:00
Automerger Merge Worker
f0e36ac714
Merge "Fix Display SurfaceControl leak" into rvc-dev am: 87293fda8d
...
Change-Id: Id022aed80b4c459db61d3fc8e9a0066c73e95e28
2020-02-25 18:31:41 +00:00
Automerger Merge Worker
44dc451f44
Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6
...
Change-Id: Id7bd3935a660ffa1dc15f13e6de2a1efa454702f
2020-02-25 18:31:17 +00:00
Automerger Merge Worker
f84af9e79a
Merge "Clear registered prediction callbacks on destroy" into rvc-dev am: 086e11fdb6
...
Change-Id: I0203e3f8132264634caa89c02b38c004ee7aab11
2020-02-25 18:31:05 +00:00
TreeHugger Robot
2c89e32d34
Merge "Make MediaParser match ExoPlayer's sniffing order" into rvc-dev
2020-02-25 18:30:35 +00:00
Peter Kalauskas
81a320279e
Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev
...
* changes:
Disable reduced scale if reduced scale config is 0
Store original task width and height instead of scale
2020-02-25 18:29:50 +00:00
TreeHugger Robot
7def6932cb
Merge "Tablet-specific UI updates to user switcher. DO NOT MERGE" into rvc-dev
2020-02-25 18:24:59 +00:00
TreeHugger Robot
c5162ed949
Merge "media: fix MediaCodecTest#testException" into rvc-dev
2020-02-25 18:21:19 +00:00
Amy Zhang
282b5c2043
Merge "Add @NonNull annotation per API Council's suggestion" into rvc-dev
2020-02-25 18:16:49 +00:00
Chavi Weingarten
87293fda8d
Merge "Fix Display SurfaceControl leak" into rvc-dev
2020-02-25 18:11:54 +00:00
Samuel Fufa
086e11fdb6
Merge "Clear registered prediction callbacks on destroy" into rvc-dev
2020-02-25 18:08:32 +00:00
Automerger Merge Worker
f2db14e26b
[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2 am: 63d81614b4
...
Change-Id: I9eb291dca37a22173b371709ff03a4cc037b07f5
2020-02-25 18:05:00 +00:00
Automerger Merge Worker
8a844efa68
Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77 am: cd98e956da
...
Change-Id: I68a5740047d908a8ae68ed9015a2365cf7a32d6d
2020-02-25 18:04:53 +00:00
Automerger Merge Worker
a8b5c26413
[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2 am: 88ae935233
...
Change-Id: I660386c4d21038c2f90e07426f86d6a59917a61b
2020-02-25 18:04:28 +00:00
Automerger Merge Worker
eebbc9778f
Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77 am: e2de88b6a4
...
Change-Id: I3a939a2b6180a41a011cc9d3ea6a9e5a7a57574d
2020-02-25 18:04:22 +00:00
Automerger Merge Worker
1ae35a61a9
Merge "Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3 am: fcd121cc5c" into rvc-d1-dev-plus-aosp
2020-02-25 18:04:14 +00:00
Automerger Merge Worker
4653ceb127
Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3 am: fcd121cc5c
...
Change-Id: Ie9946f9ad1ce8d9c5753ecf96dfafda1ff8c9bbe
2020-02-25 18:04:06 +00:00
Automerger Merge Worker
cde7c55e66
Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3 am: a272084d17
...
Change-Id: I10d2df76441ea6aa7cbccdada2dbf71437562589
2020-02-25 18:04:04 +00:00
Automerger Merge Worker
88ae935233
[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2
...
Change-Id: I468f7b0ec71699e61343f6f71afcf14fa98cad9e
2020-02-25 17:53:17 +00:00
Automerger Merge Worker
e2de88b6a4
Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77
...
Change-Id: Ifbe668bcc0a6a15155786927a944451f4935873d
2020-02-25 17:53:10 +00:00
Automerger Merge Worker
63d81614b4
[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours am: c644bff0c2
...
Change-Id: I935111857dd07ae60c29e201e9c15b09eb7799be
2020-02-25 17:52:46 +00:00
Automerger Merge Worker
cd98e956da
Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev am: 9962f03b77
...
Change-Id: Ice9d0b08a0c350a8ed3815d3f7bb7d229d8568eb
2020-02-25 17:52:39 +00:00
Automerger Merge Worker
a272084d17
Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3
...
Change-Id: Iaea61aab1ce03ec398812e8cca18187995929672
2020-02-25 17:52:23 +00:00
Automerger Merge Worker
fcd121cc5c
Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3
...
Change-Id: I7a8a2996985ed8acedbcc9a63740b54522545300
2020-02-25 17:52:07 +00:00
Automerger Merge Worker
c644bff0c2
[automerger skipped] Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev am: b896072638 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I45d10cb78a32e891fc3fcd05b6b5232ba7762457
2020-02-25 17:51:59 +00:00
Sunny Goyal
9962f03b77
Merge "Updating documentation for isDefaultApplicationIcon API" into rvc-dev
2020-02-25 17:46:23 +00:00
Fabian Kozynski
c6616838c3
Merge "Set default for controls as enabled." into rvc-dev
2020-02-25 17:40:14 +00:00
Eric Berglund
b896072638
Merge "DO NOT MERGE Hold onto NotificationListener when reconnecting notifications UI." into qt-qpr1-dev
2020-02-25 17:37:15 +00:00
