Commit Graph

542466 Commits

Author SHA1 Message Date
TreeHugger Robot
983648556a Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946 am: 1a31b4c243 am: a29c4ea521
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: Ib6c578e294f1cfb623c31066381e5372fb13b56d
2020-06-12 19:28:39 +00:00
TreeHugger Robot
d2903b9072 Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946 am: 1a31b4c243 am: 6cea42d680
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: Iaba766ee79c79b8a5cf9a0d4333c8aeaded277d7
2020-06-12 19:28:26 +00:00
TreeHugger Robot
bcc77f9cec Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946 am: 3e420d2bf7 am: 41d5738888
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: Id315da314d5f07bb468919582ec924462002066d
2020-06-12 19:28:18 +00:00
Automerger Merge Worker
67ee46fccf Merge "Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 7f5ccdc29f am: 5624a76687" into rvc-qpr-dev-plus-aosp 2020-06-12 19:28:10 +00:00
Automerger Merge Worker
869b772dc7 Merge "Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 7f5ccdc29f" into rvc-d1-dev-plus-aosp am: 5ab375f572
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: I0a499cec73473c81396cdf4eb2fd73884bc01e2d
2020-06-12 19:27:55 +00:00
Winson Chung
54943218e9 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 7f5ccdc29f am: 5624a76687
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: I4555bc702a3e6c413c1a23076ee74e59c9d198d1
2020-06-12 19:27:43 +00:00
Winson Chung
ed31fcb9a7 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 86242fe0c3 am: daa1c4b697
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: I29e9d989200e2e60300b6d75d103ad62a5dcf48c
2020-06-12 19:27:35 +00:00
Lyn Han
2e37995973 Merge "Up char limit for dismiss option in manage menu" into rvc-dev am: f3e7dfe156
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850284

Change-Id: I0e173a4f6979cd1e34e7b26156a621fad596cc79
2020-06-12 19:20:44 +00:00
Lyn Han
12715fd1b3 Merge "Up char limit for dismiss option in manage menu" into rvc-dev am: f3e7dfe156
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11850284

Change-Id: Ib3a96abd6f5bb1a40f7211594e35d5f38bac3569
2020-06-12 19:20:25 +00:00
TreeHugger Robot
6cea42d680 Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946 am: 1a31b4c243
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: I5863018294245fb80130c196893a38d08a02b787
2020-06-12 19:14:54 +00:00
TreeHugger Robot
41d5738888 Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946 am: 3e420d2bf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: I99e269f8cd756937e9f5e1e3530de78a879cf2cd
2020-06-12 19:14:23 +00:00
Automerger Merge Worker
5ab375f572 Merge "Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 7f5ccdc29f" into rvc-d1-dev-plus-aosp 2020-06-12 19:14:16 +00:00
TreeHugger Robot
a29c4ea521 Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946 am: 1a31b4c243
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: I28e5b1da8a5368c84ae47e74f4bb2527332c3d0d
2020-06-12 19:14:14 +00:00
Winson Chung
daa1c4b697 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 86242fe0c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: Ifda042a10f51a11df65a522b99eda6af95341823
2020-06-12 19:14:04 +00:00
Winson Chung
5624a76687 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 7f5ccdc29f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: Ia3f45d76261418bc3c840764cf354a1b06ab6a1b
2020-06-12 19:14:03 +00:00
Winson Chung
fcb3abade2 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656 am: 7f5ccdc29f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: I8db9b67bc4f92ed88657e1fdf994cdb2a15c8c37
2020-06-12 19:14:00 +00:00
Lyn Han
f3e7dfe156 Merge "Up char limit for dismiss option in manage menu" into rvc-dev 2020-06-12 19:10:26 +00:00
Kevin Chyn
6a9945a3c8 Add SafetyNet logging for b/79776455
Test: Auth is not started after lockdown or reboot
Fixes: 79776455
Change-Id: I9df6cb7fa59a611f81baf4f368df208598f3de3a
2020-06-12 12:04:24 -07:00
TreeHugger Robot
1a31b4c243 Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: Ia10e487643dd6d6b632565ecbc58ae8adb016243
2020-06-12 19:02:26 +00:00
TreeHugger Robot
3e420d2bf7 Merge "Internal version of isChangeEnabled." into rvc-dev am: 6bf0b87946
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11810848

Change-Id: I605e847f2ae78d41f64207de6d03c97d8b103424
2020-06-12 19:02:17 +00:00
Winson Chung
86242fe0c3 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: I59ced260c9b05ba458d3a686b8e477df73b905a9
2020-06-12 19:02:06 +00:00
Winson Chung
7f5ccdc29f Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev am: 3800919656
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819398

Change-Id: Ife835aa6c11204d99277de0c95321c5018edbf93
2020-06-12 19:02:02 +00:00
Govinda Wasserman
bdabcc36f3 Migrates additional Assistant logging to Westworld
Test: Tested locally
BUG: 147508374
Change-Id: I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e
Merged-In: I306dfc37155caf0c3d9c5db23e1fdc9d5d37399e
2020-06-12 18:54:50 +00:00
TreeHugger Robot
6bf0b87946 Merge "Internal version of isChangeEnabled." into rvc-dev 2020-06-12 18:54:22 +00:00
Andy Hung
d57f934bc5 Merge "statsd: Add audio device usage protos." into rvc-dev am: 8cda481f5b am: 59637517a2 am: 291922ef7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602068

Change-Id: I40fba080c47e08259b146604a4f881980ffdca2e
2020-06-12 18:46:58 +00:00
Winson Chung
3800919656 Merge "Restore overlay change broadcast handler for secondary users" into rvc-dev 2020-06-12 18:46:51 +00:00
Andy Hung
8d9016cf16 Merge "statsd: Add audio device usage protos." into rvc-dev am: 8cda481f5b am: 0a1901be54 am: f13efd8b79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11602068

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

Change-Id: Ie64cfeb2acf271b3d2edacdac3bb6540148d4f1b
2020-06-12 18:46:28 +00:00
Mady Mellor
9188268fdb Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: f4734b2025 am: 947b7e9969
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844113

Change-Id: I79966320cdf777a9342d394a5a4a21e8c31b9387
2020-06-12 18:46:03 +00:00
Fabian Kozynski
bc9e504f2c [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd -s ours am: 09cb03f9a5 -s ours am: 1b21c2cd12 -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: I205b637270917b23b5af8f446472f049c86358fe
2020-06-12 18:45:35 +00:00
TreeHugger Robot
29ee219ed7 Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: 4ec759369e am: ea99c16f81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

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

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

Change-Id: I90ce77361f5d6dbf2e05b94cefe595447adc6f30
2020-06-12 18:44:56 +00:00
Fabian Kozynski
d803812939 [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd am: aa12f3ec07 -s ours am: 5dcfc30105 -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: Id4975b0f9810369d00e73c54fd840d80255c3a12
2020-06-12 18:44:47 +00:00
TreeHugger Robot
c725519bff Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: e0cb2d3dd9 am: 2d75e92ad3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

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

Change-Id: Id7eccdcc535ac24ca90aa68ddc46dcb439fc7800
2020-06-12 18:44:06 +00:00
Automerger Merge Worker
4274d0975d Merge "Merge "Don't animate reorder/add when we're about to collapse." into rvc-dev am: f083c15656 am: ac92ed7bcb am: 3a2916c915" into rvc-qpr-dev-plus-aosp 2020-06-12 18:44:05 +00:00
TreeHugger Robot
fb7f759843 Merge "Notify window manager service that we are switching users" into rvc-dev am: 12b5186f28 am: 69a5697ee2 am: ec40f07ea1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821052

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

Change-Id: I09023ad71480f277971e1227aa19944864ada6c3
2020-06-12 18:43:48 +00:00
Automerger Merge Worker
c0b74dbe70 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 am: 54ba6eb4b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852403

Change-Id: Icdf4af610d72f59b15a446596587f100ae44bea7
2020-06-12 18:43:32 +00:00
Automerger Merge Worker
f2b7d031e9 Merge "Merge "Fix an obscure NPE" into rvc-dev am: fe96fa8b19 am: f4734b2025 am: 61d539cbd8" into rvc-qpr-dev-plus-aosp 2020-06-12 18:43:19 +00:00
Automerger Merge Worker
a294d2a50c Merge "Merge "Adding blur supported check to shared lib" into rvc-dev am: 7775314ff8 am: 3559a13de9" into rvc-d1-dev-plus-aosp am: 515db50b02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11844114

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

Change-Id: I600b9dafeaa42d22b13ea59342f161adbca09bb0
2020-06-12 18:43:06 +00:00
Fabian Kozynski
378b9c7ea8 [automerger skipped] Merge "Add multi-user support for AutoTileManager" into rvc-dev am: 80e047bcbd -s ours am: 09cb03f9a5 -s ours am: 8d6daa48ec -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: Ib85528895ad5b80208d8537c252aff18298ed7a7
2020-06-12 18:42:51 +00:00
Automerger Merge Worker
db77977c8b Merge "Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: 4ec759369e am: 2d9c53eac5" into rvc-qpr-dev-plus-aosp 2020-06-12 18:42:45 +00:00
TreeHugger Robot
e1bddeb612 Merge "RebootEscrowManager: service-specific exceptions" into rvc-dev am: 26bc02ad4d am: 4ec759369e am: 2d9c53eac5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842173

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

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

Change-Id: Ieae3b406362e67f6108bb0fad5d0aabce003857e
2020-06-12 18:42:25 +00:00
Andy Hung
f13efd8b79 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: I3361fada61572edadc5b525eb2e947b11d518038
2020-06-12 18:36:51 +00:00
TreeHugger Robot
1fb1d40c46 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: I068fb4166bcea490546d0cbac79b46a47cdec532
2020-06-12 18:36:43 +00:00