Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4d971a7ab7 Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: I5f967484ba390332f64083405137615fc97e9354
 2020-06-18 21:23:05 +00:00
TreeHugger Robot
fd4448ac32 Merge "Controls UI - Do not update while drag in progress" into rvc-dev am: a7143d54c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11919891

Change-Id: I993b739f8d58c7a1250a907097439b7d4c138056
 2020-06-18 21:22:49 +00:00
Lucas Dupin
86bd9e4096 Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 84f8d7602f am: 82f031899f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Ib8cce02c03bd8eeaa75084fbbf43d96a352a9daf
 2020-06-18 21:21:08 +00:00
Automerger Merge Worker
b9df002cd0 Merge "Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069" into rvc-d1-dev-plus-aosp am: b2c1b3c359 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Id7678d6baa7d2d0b873bde26276f9b2110bcdec5
 2020-06-18 21:20:46 +00:00
Automerger Merge Worker
2b35012e79 Merge "Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 am: 73cf407d05" into rvc-qpr-dev-plus-aosp 2020-06-18 21:18:48 +00:00
Automerger Merge Worker
3be46fd4a5 Merge "Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: eebb93f449" into rvc-d1-dev-plus-aosp am: aa142e4420 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: Iceed523ad88605bea7a23cdc77b2f821305d2b7a
 2020-06-18 21:18:41 +00:00
Lucas Dupin
84ffc64020 Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 am: 73cf407d05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Ib9595c3f029a54ca61ecc62809194859295a72fa
 2020-06-18 21:18:38 +00:00
Automerger Merge Worker
d9d179e1d5 Merge "Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 am: 11059a36cf" into rvc-qpr-dev-plus-aosp 2020-06-18 21:18:31 +00:00
TreeHugger Robot
84933901b8 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 am: 11059a36cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I96dc1e10445d6c1ecd5614b39d207531a47044ae
 2020-06-18 21:18:23 +00:00
TreeHugger Robot
69f6f7999c Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 am: fde816b3e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: Ie37fd352c86aaff57752065198d0a4aa355cbc91
 2020-06-18 21:18:15 +00:00
Fabian Kozynski
5f5e569c9e Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 74982485c7 am: 6c48c6595d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I8dd3a9b25a2c2b08d278143710e5f71bd8abc8d6
 2020-06-18 21:17:58 +00:00
Automerger Merge Worker
197d9a7576 Merge "Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e am: 706259089a" into rvc-qpr-dev-plus-aosp 2020-06-18 21:17:48 +00:00
Fabian Kozynski
81018365d2 Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e am: 706259089a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I862bdf81c3fc7b6deec20726d0427cffacd046cf
 2020-06-18 21:17:41 +00:00
Fabian Kozynski
8a1396cfd6 Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e am: d20f314b51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: Iac2bdf22c1d2e38e293ea211b438b5c7ac428078
 2020-06-18 21:17:27 +00:00
TreeHugger Robot
a7143d54c7 Merge "Controls UI - Do not update while drag in progress" into rvc-dev 2020-06-18 21:06:25 +00:00
Lucas Dupin
82f031899f Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 84f8d7602f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: I15fded68a418b36bb9d520821792858e3f5685d0
 2020-06-18 21:04:47 +00:00
Lucas Dupin
73cf407d05 Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: I85855947987e4cc06994b0143b8b1828ea265e8b
 2020-06-18 20:59:32 +00:00
Automerger Merge Worker
b2c1b3c359 Merge "Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069" into rvc-d1-dev-plus-aosp 2020-06-18 20:59:30 +00:00
Lucas Dupin
91bcf9529f Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 am: 8d4b42a069 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: Ia64188ec693e2595eab40bdbf2e3ee2714eb8b04
 2020-06-18 20:59:24 +00:00
Automerger Merge Worker
aa142e4420 Merge "Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: eebb93f449" into rvc-d1-dev-plus-aosp 2020-06-18 20:59:23 +00:00
TreeHugger Robot
11059a36cf Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I3ad438f138b9cfb453eafc75bf048b80a62d3479
 2020-06-18 20:59:23 +00:00
TreeHugger Robot
bd84e42be5 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: eebb93f449 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: Ifecce1360dd4568cc385f68cb365c7dad89e798a
 2020-06-18 20:59:16 +00:00
TreeHugger Robot
fde816b3e2 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 am: dea05a61f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: Id5bb76d30afca27d7d2be0659b5994a6bbed94d7
 2020-06-18 20:59:10 +00:00
Fabian Kozynski
706259089a Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I6b859d50740d54d041be97f86cc8f7b6a1df7174
 2020-06-18 20:58:55 +00:00
Fabian Kozynski
6c48c6595d Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 74982485c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I83ba5b59e2061673644a56e0803056b246881fd6
 2020-06-18 20:58:54 +00:00
Fabian Kozynski
d20f314b51 Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d am: 9d4f06e16e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: Ic91b6a8020c4fe73273b407eb1ffd0271d08a830
 2020-06-18 20:58:42 +00:00
Lucas Dupin
84f8d7602f Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: I67939a3741b21b48eecc1402d848cf3acef42467
 2020-06-18 20:51:57 +00:00
Lucas Dupin
8d4b42a069 Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11902767

Change-Id: I2ba16cb8e34ba0e4ed6012884fcca426bb50fbab
 2020-06-18 20:51:21 +00:00
TreeHugger Robot
eebb93f449 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I41ad1dbc1807cae0d302c515a44b871c4a238142
 2020-06-18 20:51:13 +00:00
TreeHugger Robot
dea05a61f1 Merge "Resumption player colorized from the album art" into rvc-dev am: e93d99c647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11912008

Change-Id: I1095b76ff7e366e432bf8a449346547414f4a82c
 2020-06-18 20:51:03 +00:00
chaviw
5452169c16 Don't clear mUsingBLASTSyncTransaction until sending callback 
If a window has drawn, it doesn't mean the client will immediately get
the callback. The applySync transaction may be waiting on other windows
to draw. In that case, we want to continue adding any transaction to the
blast sync transaction to ensure we don't submit changes until the
client gets a chance to handle the transaction. This is done by delaying
when mUsingBLASTSyncTransaction is set to false so all requests for the
WindowContainers are still added to the syncTransaction

Additionally, don't report back that the window completed the draw until
we allow for one more performSurfacePlacmement. It's possible that the
window has other changes that need to be added to the syncTransaction so
only notify onTransactionReady when we allow one more pass to gather the
transaction information.

Test: Split screen
Test: WindowOrganizerTests
Fixes: 158793236
Change-Id: If0a4071869fa1ba70f59aad25606a6e3cb7dafee
 2020-06-18 13:51:01 -07:00
Lucas Dupin
fe16654f21 Merge "Do not dismiss notification, flip activity flag" into rvc-dev 2020-06-18 20:48:32 +00:00
TreeHugger Robot
e93d99c647 Merge "Resumption player colorized from the album art" into rvc-dev 2020-06-18 20:48:13 +00:00
Fabian Kozynski
74982485c7 Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I34ddfe97270f2a493f86c638e9f9a2a3eb681a8b
 2020-06-18 20:44:12 +00:00
Fabian Kozynski
9d4f06e16e Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893819

Change-Id: I0c8ec576bf3ec6a43b86b58d0c25dff969004560
 2020-06-18 20:43:59 +00:00
Eugene Susla
2a1bf58ebb Fix NPE when exempting CDM apps from auto revoke 
Test: presubmit
Fixes: 159233540
Change-Id: I6f4aa5dc92d5adb00662f091863e0d26f5a4eb66
 2020-06-18 13:38:30 -07:00
Fabian Kozynski
5a7e06187d Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev 2020-06-18 20:33:15 +00:00
TreeHugger Robot
f1a6379b99 Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 766a8501b5 am: 0a2e94c1b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480

Change-Id: I45d7b220c37ed8f47dde48c20637805fa04a573d
 2020-06-18 20:31:09 +00:00
TreeHugger Robot
86b24981f8 Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a am: aaca11c5e9 am: 6e27150400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: Ica6cd68fafc8d890d45a62b62bcab382dc7a0809
 2020-06-18 20:30:58 +00:00
TreeHugger Robot
92c0cd3302 Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 4dcd6ee8ac am: 0344eb3d3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I17aca050060b0aadec256ff1b16583038211c014
 2020-06-18 20:29:58 +00:00
TreeHugger Robot
d9dae0cf76 Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 82d75b27d9 am: 1ae6c9f481 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480

Change-Id: Ic62f07636e638fde4f6716f07458b2b57a0350ac
 2020-06-18 20:29:35 +00:00
TreeHugger Robot
7f190ea593 Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a am: a1a8fc3806 am: be5745669a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: Ife9a4cc207b0cc10e21150be13bfd7571184ddbd
 2020-06-18 20:29:18 +00:00
Automerger Merge Worker
31738feb49 Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f" into rvc-d1-dev-plus-aosp am: 2d2ae18c7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I484f05b99edbe83aeb446c4e5178ba7a20f0839c
 2020-06-18 20:28:46 +00:00
TreeHugger Robot
4f8acf92ec [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 3adc5af9fd -s ours am: 0e8b14e6e5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186

Change-Id: I7ed3552e287a873c36c5980218582dff69366c9f
 2020-06-18 20:28:24 +00:00
TreeHugger Robot
4b3a1684aa Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 82d75b27d9 am: 220b9a18fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480

Change-Id: I0b3add1a3d76216279b20de6bfa58d253b45c7f1
 2020-06-18 20:28:09 +00:00
TreeHugger Robot
417be91d76 Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa4a am: a1a8fc3806 am: 116537e5fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11915546

Change-Id: If1bc92fe16c9f6e089f014760b893043f253c55b
 2020-06-18 20:27:56 +00:00
Automerger Merge Worker
3c9bf33ee5 Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f am: c06c8f9f02" into rvc-qpr-dev-plus-aosp 2020-06-18 20:27:52 +00:00
Automerger Merge Worker
77fb838999 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours am: c2d85b8205 -s ours" into rvc-qpr-dev-plus-aosp 2020-06-18 20:27:39 +00:00
TreeHugger Robot
2ee3885368 Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 7986672c6f am: c06c8f9f02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11914600

Change-Id: I36daec58328a13c6fadb4230a7629d5923735a0e
 2020-06-18 20:27:39 +00:00
TreeHugger Robot
d13cc53aab [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours am: 26c928e7f5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186

Change-Id: I6ee7788d7057c34ba1e61f8564000c744f51b338
 2020-06-18 20:27:28 +00:00