Commit Graph

673711 Commits

Author SHA1 Message Date
Bill Yi
4da55ec987 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: d273e87d18 -s ours am: 062bb2032b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0dce3d9e080d8388cf28e88ebf23cc56f9dcbaa0
2021-09-29 17:35:15 +00:00
Bill Yi
a48f918f95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 2683d9d782 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc97fb1ec342ec79b2b63ec8f2465170eaa6a643
2021-09-29 17:35:03 +00:00
Bill Yi
06fbe9fb3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: 56a79c9676 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieebaaa2323593d03dec9c60a86c4969793908f73
2021-09-29 17:34:56 +00:00
Bill Yi
8067d21b87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 5fe5b29efd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32a072137c288bf40eabee3e9934f3bc45462165
2021-09-29 17:26:28 +00:00
Lucas Dupin
71d3f5bb9e Add multi-user jank monitoring
Created CUJ for monitoring jank when switching users, including guest
users, but excluding the "Add User" user journey.

Bug: 200160966
Test: switch users manually, look at logs
Test: atest KeyguardUpdateMonitorTest
Test: atest UserSwitcherControllerTest
Change-Id: I5570133a1f96a58d39a8f053f9f480cdaada8df1
2021-09-29 10:26:26 -07:00
Bill Yi
3504ff389f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: de186d7ee7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib72e6044a667bfd710b4da68267e8802db1e17c6
2021-09-29 17:26:20 +00:00
Bill Yi
4d1228138b Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev am: 80474f4697
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: Ib8338b505c89004a74a262ede98b8e547737d58b
2021-09-29 17:26:04 +00:00
Bill Yi
07b9fe79ad [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: 6f51b6d2bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c2cef8937a8065360deef96638d281d0d5e8a74
2021-09-29 17:25:59 +00:00
Bill Yi
9dc35189b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours am: 5fe5b29efd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2fca86738fb189c1d6ecaac0784e35071d96b73c
2021-09-29 17:25:58 +00:00
Bill Yi
81c4852c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: de186d7ee7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee75800205798733588038c37917f28df6ff0caa
2021-09-29 17:25:52 +00:00
Bill Yi
43e941e458 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev am: 80474f4697
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: I653979489e6cf58bb0fcdd934235286ce3294508
2021-09-29 17:25:30 +00:00
Bill Yi
06a0e04a71 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: 6f51b6d2bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d3b6158dd481ecdab50c59239d045c5297553d9
2021-09-29 17:25:28 +00:00
Bill Yi
2dc674139d Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: Ib53c605abccaa97a272f88f50dc9dc600e4c6ef8
2021-09-29 17:25:12 +00:00
Bill Yi
fe3dd2b7bb [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: 62323d8c9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a265b02fad723f9214ffc9861b43be4b012859f
2021-09-29 17:25:06 +00:00
Bill Yi
b3d5341c6e Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev am: 5d854dd46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: If232b8650d6bc616cf5c028f6f37da588da82410
2021-09-29 17:25:03 +00:00
Bill Yi
e29dd3284c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: 62323d8c9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c99990eb431f00205b2dac7f2ddf1186f50e3b9
2021-09-29 17:24:55 +00:00
Bill Yi
99669a9da9 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: I80c8c8bb7fd5fd376e9330cf7f5db4e69cc66e35
2021-09-29 17:24:28 +00:00
Bill Yi
00d5c23e54 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: d273e87d18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13e1f12630f2432b420b2851742c6adff0893b35
2021-09-29 17:24:23 +00:00
Bill Yi
7a81b7d5b6 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: I426d86eaf34840367aa58cfcc871f4042175696b
2021-09-29 17:23:44 +00:00
Bill Yi
062bb2032b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: d273e87d18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic516be63c09de7c31642a490f70eeb0426bb90f1
2021-09-29 17:23:31 +00:00
Bill Yi
5fe5b29efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c08835b045cde1e7d823fbfbf8de5d555526a0a
2021-09-29 17:23:19 +00:00
Bill Yi
de186d7ee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If665263929a6748b3690c5326a6aaa4cb4f47d57
2021-09-29 17:23:11 +00:00
Bill Yi
2683d9d782 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b0cde68ecf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8587ba2195354fc3e8e43de3045c8358dc36fdc0
2021-09-29 17:22:45 +00:00
Bill Yi
56a79c9676 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If744b7c0d0122bac42d4f7db70a6ca1026beb4b4
2021-09-29 17:22:06 +00:00
Bill Yi
dfdf2620d1 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-dev-plus-aosp am: d919594781 am: 7c7eef4bdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: I0c1b5261a5717dfbdcec10f735a69d2707526963
2021-09-29 17:18:05 +00:00
Bill Yi
7fac30ef2c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: dd2408bfe7 -s ours am: d51c97bcbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic17f3e27a1d147b09a8af6990fb5ec2f4e235148
2021-09-29 17:18:03 +00:00
Bill Yi
8362447179 Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-dev-plus-aosp am: 2bced2c85f am: 80ac314d9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: I1f2f400e5dc2b160bece60900852c57f680b5ed6
2021-09-29 17:17:54 +00:00
Bill Yi
17fd3ede6b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: a04424c5e2 -s ours am: 176150c158 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If35728344769f0ef3b61ed6aa470e4c369ee795d
2021-09-29 17:17:52 +00:00
Bill Yi
1435145faa Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-dev-plus-aosp am: c64feab371 am: 6f1207b997
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: I54ee60b3df498c8f16084e5162fc8144ff94a8f0
2021-09-29 17:17:25 +00:00
Bill Yi
352315657c [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: 7351941662 -s ours am: ac1e36b59f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6983bdf5d3c1184754237f7dc9c4d574221b0785
2021-09-29 17:17:22 +00:00
Bill Yi
7c7eef4bdb Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-dev-plus-aosp am: d919594781
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: I43ebad50f80757296be3074a2fb83239b82409b7
2021-09-29 17:15:06 +00:00
Bill Yi
d51c97bcbd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 am: dd2408bfe7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibece07dc2c0cc3ba658eec39e7d18a6ae3dc5345
2021-09-29 17:14:57 +00:00
Bill Yi
80ac314d9d Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-dev-plus-aosp am: 2bced2c85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: Id611dfe23065ad49688067854f6f246dd66aeaa7
2021-09-29 17:14:19 +00:00
Bill Yi
176150c158 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d am: a04424c5e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0472c6b378212bee26deade5d9f715011d6a857d
2021-09-29 17:14:17 +00:00
Automerger Merge Worker
935c16acc7 Merge "Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6aea am: 8d943ec2b0" into sc-v2-dev-plus-aosp 2021-09-29 17:14:04 +00:00
TreeHugger Robot
a85b68388e Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6aea am: 8d943ec2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15925291

Change-Id: I1160854d00bf567b9569f21a4b5a1f67971df466
2021-09-29 17:13:35 +00:00
TreeHugger Robot
b08043a76d Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0 am: d0bfa4c226
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: Ic8e6b2bf6aac93bb8db6d658cbce43b2d8d36d03
2021-09-29 17:13:34 +00:00
Bill Yi
6f1207b997 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-dev-plus-aosp am: c64feab371
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: I3b312794c98c004203d0eb8da8ab7f80c151601d
2021-09-29 17:13:29 +00:00
Bill Yi
ac1e36b59f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 am: 7351941662 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f1913a66dfc6fa1817f74520ffa8542ee931373
2021-09-29 17:13:20 +00:00
TreeHugger Robot
d0bfa4c226 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca am: cbb7188ae0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: I151133e723e08ae9bb222970f5ffd81fc9880cd3
2021-09-29 17:12:59 +00:00
TreeHugger Robot
17bd675f99 Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6aea am: 653e6d8108
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15925291

Change-Id: I799b56e2bff31d0b3148e1368ba6c9085e62f790
2021-09-29 17:12:51 +00:00
Bill Yi
b0cde68ecf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-29 17:09:50 +00:00
Bill Yi
80474f4697 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893
  Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:09:50 +00:00
Bill Yi
d919594781 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893
  Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:09:50 +00:00
Bill Yi
5d854dd46c Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d
  Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:09:06 +00:00
Bill Yi
75afb515a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-29 17:09:06 +00:00
Bill Yi
2bced2c85f Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d
  Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:09:06 +00:00
Bill Yi
28dbc918b6 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76
  Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:08:48 +00:00
Bill Yi
c64feab371 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76
  Import translations. DO NOT MERGE ANYWHERE
2021-09-29 17:08:48 +00:00
TreeHugger Robot
8d943ec2b0 Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6aea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15925291

Change-Id: I1e9d744bacd798e3f4d19799c0501acfef5e269a
2021-09-29 17:00:20 +00:00