Commit Graph

542466 Commits

Author SHA1 Message Date
Mady Mellor
947b7e9969 Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: f4734b2025
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: I352e0052428698290d0ddb8f2680f0c03269f7b2
2020-06-12 18:36:30 +00:00
Andy Hung
ebfe9f8154 Merge "statsd: Add audio device usage protos." into rvc-dev am: 8cda481f5b am: 0a1901be54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602068

Change-Id: I758988c2779193352a2d563cf23e4a5a88430923
2020-06-12 18:36:16 +00:00
TreeHugger Robot
ec40f07ea1 Merge "Notify window manager service that we are switching users" into rvc-dev am: 12b5186f28 am: 69a5697ee2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821052

Change-Id: I7206f79f57850bbde1ebca0b615f100ab96db8c0
2020-06-12 18:36:09 +00:00
Fabian Kozynski
1b21c2cd12 [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd -s ours am: 09cb03f9a5 -s ours
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: I03c0f58500950e2b6dc3ce9192c74b127ed2ae28
2020-06-12 18:36:06 +00:00
Mady Mellor
61d539cbd8 Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: f4734b2025
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: I8ad06ccd9ce5d70f773fbedacbe767dace1a012f
2020-06-12 18:36:01 +00:00
Fabian Kozynski
8d6daa48ec [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd -s ours am: 09cb03f9a5 -s ours
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: I0bb78b9844a0861214ba20762972dc1ceaacfbb3
2020-06-12 18:35:53 +00:00
TreeHugger Robot
2d9c53eac5 Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: 4ec759369e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

Change-Id: I2bbd7f8927d483d054ecb4c03aadb39de586bdde
2020-06-12 18:35:45 +00:00
TreeHugger Robot
ea99c16f81 Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: 4ec759369e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

Change-Id: Iac480e4eb4761af24e45669063a86107d2921bc4
2020-06-12 18:35:44 +00:00
Andy Hung
59637517a2 Merge "statsd: Add audio device usage protos." into rvc-dev am: 8cda481f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602068

Change-Id: Ia1a95da810e705e078677b860e401adb7cf7ab2e
2020-06-12 18:32:17 +00:00
TreeHugger Robot
d25b02fe8a Merge "Notify window manager service that we are switching users" into rvc-dev am: 12b5186f28 am: 5b380adbfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821052

Change-Id: I52ffa7678fe60868032c52dcb1fa286dcf0eeb54
2020-06-12 18:32:15 +00:00
Andy Hung
0a1901be54 Merge "statsd: Add audio device usage protos." into rvc-dev am: 8cda481f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602068

Change-Id: Iee250538f341951fed41591fa31b4c56fd83e337
2020-06-12 18:32:14 +00:00
Mady Mellor
1a7ed407bc Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: a46f7ea2e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: Ie85e1315718ab83df06eabd00a6682a98dc9b781
2020-06-12 18:32:04 +00:00
TreeHugger Robot
69a5697ee2 Merge "Notify window manager service that we are switching users" into rvc-dev am: 12b5186f28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821052

Change-Id: Ibc8f185b563c3f800bfbcba5882859946c85dc88
2020-06-12 18:32:03 +00:00
TreeHugger Robot
5b380adbfd Merge "Notify window manager service that we are switching users" into rvc-dev am: 12b5186f28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821052

Change-Id: Ifb0637f03db7e00b2165d6883c06fc6d5abc6f96
2020-06-12 18:32:00 +00:00
Fabian Kozynski
5dcfc30105 [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd am: aa12f3ec07 -s ours
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: Ib7f70475b42c5e0acf0373d3c6a2b41bd83e0554
2020-06-12 18:31:57 +00:00
Mady Mellor
f4734b2025 Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: If843ec2ce532da2402a5ea96440543e00c7ed151
2020-06-12 18:31:43 +00:00
Mady Mellor
a46f7ea2e8 Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: I95d531fea84c90efa575ab9dda9e3ee134388cf8
2020-06-12 18:31:42 +00:00
TreeHugger Robot
2d75e92ad3 Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: e0cb2d3dd9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

Change-Id: Icdee57ecb6205c0226231e571ac183716ffc8339
2020-06-12 18:31:37 +00:00
TreeHugger Robot
3a2916c915 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 am: ac92ed7bcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: I03b99a48cf8e1972c77f65d7475bd5df820c09b6
2020-06-12 18:31:23 +00:00
Fabian Kozynski
aa12f3ec07 Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11396803

Change-Id: Ie9fd064ab032a531ff4e944e7deae61bb84b88eb
2020-06-12 18:31:23 +00:00
Fabian Kozynski
09cb03f9a5 [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd -s ours
am skip reason: Change-Id I518334cca0a0960e0b3b74b43ac9fce4610c7bd0 with SHA-1 31a266d5a3 is in history

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

Change-Id: If6a7b7e75cfbc4b0f22d17c664d5a630697c2fc3
2020-06-12 18:31:14 +00:00
TreeHugger Robot
4fa7ebc099 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 am: 3cb62293a9 am: 6dcf1c051e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: If5afcf51b811fe7d0b2d60f6ba6e8071ec04727f
2020-06-12 18:31:10 +00:00
TreeHugger Robot
933a38112c Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 38c9217417 am: 7afe8b7368
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: I3543fee30790dba309d7bf59c0c07816422074de
2020-06-12 18:30:59 +00:00
TreeHugger Robot
e0cb2d3dd9 Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

Change-Id: I202a9c52410c31026ded7ea371ea4dd4b27d4a6e
2020-06-12 18:30:58 +00:00
TreeHugger Robot
4ec759369e Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

Change-Id: Ie688bfc001c6cbd1b040513249b72bbf40d4c072
2020-06-12 18:30:56 +00:00
Automerger Merge Worker
54ba6eb4b9 Merge "Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 am: 3cb62293a9" into rvc-d1-dev-plus-aosp 2020-06-12 18:30:49 +00:00
TreeHugger Robot
6dcf1c051e Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 am: 3cb62293a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: I6d95f05ba30be964af7298372d2a96cdbc2aee69
2020-06-12 18:30:49 +00:00
TreeHugger Robot
e0a768e529 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 am: 3cb62293a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: I9aa3095d3dead069d513cfe15ee964ff3d1ce692
2020-06-12 18:30:42 +00:00
Mark Chien
46be60dea4 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: dfae0aad30 am: 3d8780d1df
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I63ea85d30b1d0070381ff7de1e4d78f6dfd1fa08
2020-06-12 18:30:38 +00:00
Automerger Merge Worker
515db50b02 Merge "Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 3559a13de9" into rvc-d1-dev-plus-aosp 2020-06-12 18:30:35 +00:00
TreeHugger Robot
ac92ed7bcb Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: I5d41f3c3e91ef0637dbbe566304bed95faf4a402
2020-06-12 18:30:28 +00:00
TreeHugger Robot
6e17185056 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 3559a13de9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: Ida7e4e2fe042a9b093392e6da533d257cee1b985
2020-06-12 18:30:27 +00:00
TreeHugger Robot
1790df6885 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 38c9217417
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: Ic04da15a62c648977250ead840db5db3b79ba044
2020-06-12 18:30:22 +00:00
TreeHugger Robot
7afe8b7368 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 38c9217417
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: Ic6e5357fd8088b5a738e63fe907c540c1528ddf2
2020-06-12 18:30:17 +00:00
TreeHugger Robot
3cb62293a9 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: I17976f92d16be49f0a653b2987d48c6bfc2ae103
2020-06-12 18:30:12 +00:00
Andy Hung
8cda481f5b Merge "statsd: Add audio device usage protos." into rvc-dev 2020-06-12 18:23:03 +00:00
TreeHugger Robot
12b5186f28 Merge "Notify window manager service that we are switching users" into rvc-dev 2020-06-12 18:21:20 +00:00
Mady Mellor
fe96fa8b19 Merge "Fix an obscure NPE" into rvc-dev 2020-06-12 18:20:44 +00:00
Fabian Kozynski
80e047bcbd Merge "Add multi-user support for AutoTileManager" into rvc-dev 2020-06-12 18:15:38 +00:00
TreeHugger Robot
26bc02ad4d Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev 2020-06-12 18:15:22 +00:00
TreeHugger Robot
f083c15656 Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev 2020-06-12 18:13:43 +00:00
TreeHugger Robot
3559a13de9 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: I7b256492b539c7818b1f245f2924000a2da849e0
2020-06-12 18:08:10 +00:00
Mark Chien
9ecf791f74 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: dfae0aad30 am: ba2627dd61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ic22410e095045d2ca71a78203eca9feabc85e1b5
2020-06-12 18:08:03 +00:00
TreeHugger Robot
38c9217417 Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

Change-Id: I25a754c1507a879f498544361e78f64cea453375
2020-06-12 18:07:47 +00:00
Mark Chien
d7ddac0e79 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: faf2d5524b am: be689dc9fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ia73e1fdbf77d04d45bda1b5486c18d8d837bf692
2020-06-12 18:07:42 +00:00
Mark Chien
3d8780d1df Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: dfae0aad30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I4d52ea1abc8adbda85643e13fd2597f33c0a00ef
2020-06-12 18:03:38 +00:00
Mark Chien
ba2627dd61 Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: dfae0aad30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: Ibdc5483f00a8554db0c00e9163b527e6f3973b85
2020-06-12 18:03:35 +00:00
Mark Chien
be689dc9fa Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: faf2d5524b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836348

Change-Id: I802dd4ee567f4210b2ad36287ff20ee706800c6d
2020-06-12 17:55:55 +00:00
TreeHugger Robot
7775314ff8 Merge "Adding blur supported check to shared lib" into rvc-dev 2020-06-12 17:54:26 +00:00
TreeHugger Robot
4f7a659aca Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: d7c6a998a1 am: 4913eb2f6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850954

Change-Id: I0473d36a4ef925217e2e4fa318c004f44a1ea0b1
2020-06-12 17:53:08 +00:00