Commit Graph

653465 Commits

Author SHA1 Message Date
TreeHugger Robot
41d0e54a5e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc070852c5d550a99c8be3d5d05d42400eb7f545
2021-08-13 23:23:54 +00:00
Bill Yi
df8a438396 Merge changes from topic "presubmit-am-a06acefa6477490ebb2f9621b57cedf9" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2984e28472
  Import translations. DO NOT MERGE ANYWHERE
2021-08-13 23:15:02 +00:00
TreeHugger Robot
69d06e9fb7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f3de0722f388d17aaea46acbe7c382eff226659
2021-08-13 23:11:50 +00:00
Bill Yi
f03061b704 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idf328fc9fd8e99f9e6e5ea77c6d5b5faa90e89cf
2021-08-13 23:05:55 +00:00
Bill Yi
da46d42b87 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 23:03:10 +00:00
Bill Yi
b701023fc0 Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 523e8000f9
  Import translations. DO NOT MERGE ANYWHERE
2021-08-13 23:03:10 +00:00
TreeHugger Robot
a4712801b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icf5beb9ee197a25a30228bac653b5dd7fe3f6c93
2021-08-13 23:00:55 +00:00
TreeHugger Robot
89e9e36295 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours am: c184057731 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7044de061d3482c3968dfe337352c5a23fd59df
2021-08-13 23:00:37 +00:00
TreeHugger Robot
c6077c7291 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d9233a75ec82c59cf654aaad72fa475682d7ed4
2021-08-13 23:00:16 +00:00
TreeHugger Robot
2e0c1a0555 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06c58f640f59ecd616482a9dccee6b77003491de
2021-08-13 22:52:21 +00:00
TreeHugger Robot
c184057731 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7a4321c576 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71340676efc68296a67411057ea86b95e89dcfd7
2021-08-13 22:52:07 +00:00
TreeHugger Robot
ee6d526833 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e9ee255d315af28a22e342e8f345cb32bf715a4
2021-08-13 22:51:44 +00:00
TreeHugger Robot
3229884baf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:49:46 +00:00
TreeHugger Robot
c488eeef43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6a9d7e4e52 -s ours am: dba5e43aeb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbee03f1060ecaea486db5476f4775d019c63bbe
2021-08-13 22:45:05 +00:00
TreeHugger Robot
17e5c43103 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours am: 7eba26bb3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I870cda8bbd851abd305cc28db34ed062195a9b5d
2021-08-13 22:44:57 +00:00
Automerger Merge Worker
0e6246c3c1 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev am: 3c65d955f6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I315683c53f8b662407e68963a75f80a1da60ec27
2021-08-13 22:44:51 +00:00
TreeHugger Robot
dba5e43aeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 6a9d7e4e52 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d442f3bef43821e54415c8a0e4742eee8415c7a
2021-08-13 22:44:26 +00:00
Max Bires
d3d4714d27 Merge "Fixing a condition that can cause deadlock" into sc-dev am: 7447381921
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15558584

Change-Id: I8377daf08aa276c5922e5cc32bdb1fb845896393
2021-08-13 22:44:02 +00:00
TreeHugger Robot
216e08207e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 035381f8e4 -s ours am: 93800f9c89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia46ce88f7804f4f96ca90e2a11b5adeb5eade659
2021-08-13 22:43:32 +00:00
TreeHugger Robot
87a0d9ef7e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:35:05 +00:00
TreeHugger Robot
7a4321c576 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:31:22 +00:00
TreeHugger Robot
7eba26bb3f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 98af4dbe78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I731401ab3156299f9ac66b68859cb8c975c08ebf
2021-08-13 22:22:50 +00:00
Automerger Merge Worker
3c65d955f6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours" into sc-dev 2021-08-13 22:22:44 +00:00
TreeHugger Robot
529fcbe929 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: efedfa2365 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib855e51c8126848e0478190c119914898a06bd05
2021-08-13 22:22:31 +00:00
Max Bires
7447381921 Merge "Fixing a condition that can cause deadlock" into sc-dev 2021-08-13 22:22:30 +00:00
TreeHugger Robot
93800f9c89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 035381f8e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16c9394998f8febad8d6f3d48840367743fa5ff4
2021-08-13 22:22:16 +00:00
TreeHugger Robot
7acc815b8e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:22:06 +00:00
TreeHugger Robot
6a9d7e4e52 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 22:18:55 +00:00
TreeHugger Robot
bcb527b129 Merge "Remove managed profile icon from QSBH" into sc-dev am: 25437b0452
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15559999

Change-Id: I944cf083b2c4a6f6a1be75430158469bc411e050
2021-08-13 22:16:15 +00:00
TreeHugger Robot
98af4dbe78 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:13:16 +00:00
TreeHugger Robot
efedfa2365 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:08:36 +00:00
TreeHugger Robot
035381f8e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 22:06:54 +00:00
TreeHugger Robot
25437b0452 Merge "Remove managed profile icon from QSBH" into sc-dev 2021-08-13 22:06:15 +00:00
TreeHugger Robot
a2c9825edb Merge "Fix OOB crash in ContentCapture for translated views" into sc-dev am: f7fb6c535e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546784

Change-Id: I62b847a14cab516de1f87e32e597c1706145979a
2021-08-13 22:03:10 +00:00
TreeHugger Robot
f7fb6c535e Merge "Fix OOB crash in ContentCapture for translated views" into sc-dev 2021-08-13 21:59:25 +00:00
Bill Yi
85f6751996 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385c28b337 -s ours am: fbd4d23c91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd1ff47feb7b50303a5449b3bfeb6ba7a921b0e4
2021-08-13 21:53:22 +00:00
Sudheer Shanka
7fccc88802 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours am: cce33c3589 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I95e619b0b5f0a86620b31fd8a2ad8668c03e4756
2021-08-13 21:53:16 +00:00
Bill Yi
32e3af5d72 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 015f5f4ac2 -s ours am: 6290323933 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I936e976102fe4dc62782e97d35767fa871d52c18
2021-08-13 21:53:05 +00:00
TreeHugger Robot
7ab30499ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours am: a40e2a39bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82d4ef7583b51b175078dfc5894775860e2bc27c
2021-08-13 21:52:12 +00:00
TreeHugger Robot
4b9d578857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96a6987826 -s ours am: 6d78431b3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5ad248384415011df43cec851ca27f8c5f41dbb
2021-08-13 21:52:01 +00:00
TreeHugger Robot
c34fc0201a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: dd5832d8e5 -s ours am: 28d546f8a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e60e3e114a2a2bd2106ffd08a04eee368c876e8
2021-08-13 21:51:49 +00:00
TreeHugger Robot
eafa32552d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 50fcaffe22 -s ours am: 65d427c1b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib2b5b2f0d56f584564ed9837f0b67702a3c05dcd
2021-08-13 21:51:33 +00:00
TreeHugger Robot
b82b3d2d4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 04c8164ada -s ours am: fa0563d581 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib20b12506556ead9dac3decfac532d986f46a476
2021-08-13 21:51:22 +00:00
TreeHugger Robot
4dfa135a05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 277d17849c -s ours am: 6f21cc649e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18e23878e92438eff19fdf02c310d739aa7f4234
2021-08-13 21:51:06 +00:00
Sudheer Shanka
ac4c95a68b [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 0ce17cddf9 -s ours am: 8502712492 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: Ie35be995bd81056f44b17f0112256ae76b944206
2021-08-13 21:50:53 +00:00
Lucas Lin
064bc99e49 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours am: 0d88bdece9 -s ours
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: If4f486ff71d52d4cc5c33e4dfc9434a5c5d6d3c0
2021-08-13 21:50:37 +00:00
Lucas Lin
d3a57f42f4 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours am: ba72ebb1ea -s ours
am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: Ib557d9a3ae150dcba3cce9aa88f4cb891fc798be
2021-08-13 21:50:23 +00:00
Bill Yi
fbd4d23c91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 385c28b337 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6683f40d46cfc0612348e653f057c8f20f97716
2021-08-13 21:47:35 +00:00
Sudheer Shanka
cce33c3589 [automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into oc-mr1-dev am: 83f71f1227 -s ours am: b0fccf4d9d -s ours am: d95a81b720 -s ours am: a899051254 -s ours am: 2ea88737b2 -s ours am: 5833c655f9 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 ad79043436 is already in history

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

Change-Id: I0c16d851fc0703c277bb691db84d58f295590a66
2021-08-13 21:46:34 +00:00
Bill Yi
6290323933 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 015f5f4ac2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9232f7a783c25bcf8a31fa5c57f6fea1953249e6
2021-08-13 21:32:43 +00:00