Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
653,441 Commits 3 Branches 0 Tags
c488eeef43256f875cfe12f46dfd043664e5b07d
Commit Graph

653441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
TreeHugger Robot
a40e2a39bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8f1cf56b89 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I1ba3e3797d358c396db60f9900dee35a06de926b
 2021-08-13 21:29:59 +00:00
Sudheer Shanka
8502712492 [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 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: I19bf066c87ecc3f59496f10642d139748ed33506
 2021-08-13 21:29:46 +00:00
Lucas Lin
0d88bdece9 [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -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: Ic93e47714ceab7d01630c4ce5026fd169b3fd12e
 2021-08-13 21:29:20 +00:00
Lucas Lin
ba72ebb1ea [automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -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: I98276ee1deb0f0e501c66e73e5988c10bf6178e3
 2021-08-13 21:28:24 +00:00
TreeHugger Robot
278c62c8b8 Merge "Auth ripple updates" into sc-dev am: 6ce7011395 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546250

Change-Id: I78b93601dd43e1cfba91b6cbda77c00a9dce6f7a
 2021-08-13 20:53:20 +00:00
Xin Li
ab3349d696 [automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 30a1c99c1b -s ours 
am skip reason: Merged-In I35aae96e4ebb0c13bc567bb926f2e7a549f554ba with SHA-1 6c582e973d is already in history

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

Change-Id: I4e344aae0efb943414ee16aa5d054d3c7232c723
 2021-08-13 20:51:42 +00:00
TreeHugger Robot
6ce7011395 Merge "Auth ripple updates" into sc-dev 2021-08-13 20:41:18 +00:00
Xin Li
30a1c99c1b Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev 2021-08-13 20:38:50 +00:00
Fabian Kozynski
1c78531922 Remove managed profile icon from QSBH 
This adds it to the ignored icons in QuickStatusBarHeaderController
iconContainer.

Test: manual, create managed profile, icon doesn't show.
Fixes: 196243622
Change-Id: Ib97b9d947318b09d289076c63995327d356cb5fc
 2021-08-13 15:50:51 -04:00
Beverly
7d8bf678f4 Auth ripple updates 
* update the interpolator for the auth ripple so that it feels faster
* start the light reveal to be slightly ahead of the ripple
* increase radius size so the ripple isn't cutoff

Fixes: 196006323
Test: manual on sunfish and raven
Change-Id: Id2277b113e1241a21d5e98c9288fea27f0474115
 2021-08-13 19:03:12 +00:00
Joshua Mccloskey
dc05d60161 Merge "Destroy() client after onClientFinished." into sc-dev am: f5704ec276 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15536554

Change-Id: Ib5be0dbb5215161f20a9e2d48a8d46e66038cfe6
 2021-08-13 18:56:26 +00:00