Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
646,232 Commits 3 Branches 0 Tags
bf424a02fa814500a40771d565ce7ef19a4896b9
Commit Graph

646232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
bf424a02fa [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours am: 648b6b5dd4 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Ia264dda2d6625b2d272aa8563f84d784e50290f8
 2021-06-09 20:04:21 +00:00
Automerger Merge Worker
9005aeb548 Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev am: ac1f0eb45a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: Id002aa3f0b8642565e0a5bcf47046802606a4aa9
 2021-06-09 20:04:13 +00:00
Tej Singh
c5e9318cf1 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours am: 61932ba12b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: I13503c432b3312c151dd6b6f6b7cc7a4fc2a3b69
 2021-06-09 20:04:10 +00:00
TreeHugger Robot
2b223ca7ff [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am: e5c71c6990 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history

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

Change-Id: I2ac45b3f7f83336ffff535b56781b118ca97e1c8
 2021-06-09 20:03:37 +00:00
Tej Singh
fed78c8fa4 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours am: 3f2ba9c995 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: Idaee0f13ee925f2be46edb5b72e516181fe8a3f6
 2021-06-09 20:03:15 +00:00
TreeHugger Robot
648b6b5dd4 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Iaf1a4699a19e745ed1a21d593fc0464b9deee56c
 2021-06-09 19:51:27 +00:00
Automerger Merge Worker
ac1f0eb45a Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev 2021-06-09 19:51:25 +00:00
Tej Singh
61932ba12b [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I698aa7200effbd9a9e6d3c3d93a159bc2f3c8b27
 2021-06-09 19:51:15 +00:00
TreeHugger Robot
e5c71c6990 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history

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

Change-Id: I09559db4221b80dc2fa564183c38765ad7f27f13
 2021-06-09 19:51:15 +00:00
Tej Singh
3f2ba9c995 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dc1552834b198177adea7242929a7b07fda1c9f
 2021-06-09 19:50:49 +00:00
Xiaoyu Jin
deaa791916 Merge "Log two new fields for initializeStats" into sc-dev am: 1b4254be03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904666

Change-Id: I9539bc350f738dea9ffef0b8452add2494b6a4e5
 2021-06-09 19:37:49 +00:00
TreeHugger Robot
548ddc79d3 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293

Change-Id: I868b0e88346f0674998770895a603e292cef4f9f
 2021-06-09 19:37:36 +00:00
Tej Singh
bc9a8147a3 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: Ic8f0c3d09b90e740f7118cac1843f1ac5e2b1b37
 2021-06-09 19:37:21 +00:00
Xiaoyu Jin
1b4254be03 Merge "Log two new fields for initializeStats" into sc-dev 2021-06-09 19:36:50 +00:00
TreeHugger Robot
94e740e288 Merge "Remove tracing for notifyContentCapture" into sc-dev am: 789fe38968 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904360

Change-Id: I3a6607eaa1024612f4fb3ee3a3e258e445641fb5
 2021-06-09 19:36:45 +00:00
TreeHugger Robot
d74f2129d3 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293

Change-Id: Ib92a9130bb53ab410758cd14d468af33bbdd7026
 2021-06-09 19:36:31 +00:00
Tej Singh
d4b7b0e3da [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: If7b65e095d15a9d260438bcb017f10ad3cae59d1
 2021-06-09 19:36:07 +00:00
TreeHugger Robot
665a84d29d Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev 2021-06-09 19:31:09 +00:00
Tej Singh
4ad8ef142c [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47c024483e5996e9268f6926b76f4282169907ec
 2021-06-09 19:24:13 +00:00
TreeHugger Robot
789fe38968 Merge "Remove tracing for notifyContentCapture" into sc-dev 2021-06-09 19:14:05 +00:00
Treehugger Robot
f80cc92614 [automerger skipped] Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" am: 388c76ada4 am: 74c6327514 -s ours 
am skip reason: Merged-In I551e0bee413432653f39c91664d716f695311b6f with SHA-1 46e5c0df76 is already in history

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

Change-Id: I033fa499701d117e1ed813294daa6539aa0280fa
 2021-06-09 18:55:46 +00:00
Max Bires
498fccac6e [automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" am: d1de4cc6e4 am: 2c455e5f1c -s ours 
am skip reason: Merged-In I917a61da612f21f9a0f783bea5d24270d4e1db42 with SHA-1 d05498b9d8 is already in history

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

Change-Id: If0f5c72756f8126129c3f55f4fdae91e0fc1f492
 2021-06-09 18:55:19 +00:00
Steve Elliott
e9db7ea04a Merge "Add callbacks for bouncer keyguard reset" into sc-dev am: 33f8e11606 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920750

Change-Id: I052d46c16ff24d48991315dcc9563152b6507916
 2021-06-09 18:46:43 +00:00
Matt Pietal
20523cded1 Merge "Controls spacing" into sc-dev am: 68db245507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750

Change-Id: Ia7b92cf9759fed0fd936449e15b34575705e66e4
 2021-06-09 18:46:09 +00:00
Ying Xu
41700855f1 Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev am: 0732d74669 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909852

Change-Id: I83747a9353950a4546b7dada0f7d5259a82dc440
 2021-06-09 18:44:44 +00:00
Tej Singh
e72a13d44c [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: I0677d318752ff2be05afb28f8db04480413722d7
 2021-06-09 18:42:55 +00:00
Steve Elliott
33f8e11606 Merge "Add callbacks for bouncer keyguard reset" into sc-dev 2021-06-09 18:26:41 +00:00
Treehugger Robot
74c6327514 Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" am: 388c76ada4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1729512

Change-Id: If29c56b48d3137e963884896888b35f6a44f0345
 2021-06-09 18:20:34 +00:00
Matt Pietal
68db245507 Merge "Controls spacing" into sc-dev 2021-06-09 18:18:44 +00:00
Ying Xu
0732d74669 Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev 2021-06-09 18:13:15 +00:00
Max Bires
2c455e5f1c Merge "Fixing the race condition in GenerateRkpKey" am: d1de4cc6e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727159

Change-Id: I65ba432d3e184f8112f5a6019cdada19a1976cc1
 2021-06-09 18:09:37 +00:00
Anna Zappone
daca21595d Merge "Fix LTR & conversation updates on main thread" into sc-dev am: d8b5c05ff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14881553

Change-Id: If64909446f15b58e47ff7f8735c996fdc916a1a7
 2021-06-09 18:04:26 +00:00
Mady Mellor
abfba98a67 Merge "Collapse the stack on clicks rather than on down" into sc-dev am: fd4a4a3ee5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14850318

Change-Id: If46c3cc3c71058511b55c3abc99375ddda1d354a
 2021-06-09 18:04:12 +00:00
Winson Chung
65540bc717 Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev am: 24de1aa861 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14912906

Change-Id: If74b1c6bd99a2b2953e4b4dec8af876fb422eb5f
 2021-06-09 18:03:57 +00:00
Treehugger Robot
03fb7d4e35 [automerger skipped] Merge "Check for invalid device attestation parameters" am: 5d08573baa am: 9dc6ec07ad -s ours 
am skip reason: Merged-In I4eeec8367ebdfad527395206ab9e89b409e02631 with SHA-1 c0133d7c47 is already in history

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

Change-Id: I9e789d3e01b220328792122a22907902b68dfe5c
 2021-06-09 18:03:33 +00:00
Julia Reynolds
78cea6e7e4 Merge "Update logic about parent and convo channels" into sc-dev am: b87598c3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14907947

Change-Id: I1022456aabdd973fac8f9617f62ae95460c3cbf7
 2021-06-09 18:02:32 +00:00
Anna Zappone
d8b5c05ff1 Merge "Fix LTR & conversation updates on main thread" into sc-dev 2021-06-09 17:58:12 +00:00
Tej Singh
af533b33b1 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25f81cbc3411addb6d5a329db983ad8324e44c7a
 2021-06-09 17:57:23 +00:00
Treehugger Robot
388c76ada4 Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" 2021-06-09 17:51:44 +00:00
Max Bires
d1de4cc6e4 Merge "Fixing the race condition in GenerateRkpKey" 2021-06-09 17:48:32 +00:00
Mady Mellor
fd4a4a3ee5 Merge "Collapse the stack on clicks rather than on down" into sc-dev 2021-06-09 17:46:55 +00:00
Winson Chung
24de1aa861 Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev 2021-06-09 17:35:35 +00:00
Winson Chung
9f6c43e65c Fix for IME exclusions not working with expanded bubble 
- Technically the IME window is above the Bubble window, but when
  traversing the windows top-down for calculating the final exclusion
  region for SysUI, the IME is placed just above its target (the
  embedded task), and the Bubble's full touchable region effectively
  overrides the IME's requested exclusion region

Fixes: 190338512
Test: Expand a bubble, swipe from IME edge
Change-Id: Idd71eabfaba1be4bc6fc90d09db28d3f9e9106c5
 2021-06-09 17:34:58 +00:00
Treehugger Robot
9dc6ec07ad Merge "Check for invalid device attestation parameters" am: 5d08573baa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730396

Change-Id: I93890a3249f87ab2d5ad497f384007179c0cedf6
 2021-06-09 17:34:18 +00:00
Julia Reynolds
b87598c3cc Merge "Update logic about parent and convo channels" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
61df18427d Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" into sc-dev am: 57fcc33111 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909796

Change-Id: I5eaedc6dc023811b3a1077ab9dd1e0674a893d21
 2021-06-09 17:20:16 +00:00
Treehugger Robot
5d08573baa Merge "Check for invalid device attestation parameters" 2021-06-09 17:16:22 +00:00
TreeHugger Robot
57fcc33111 Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" into sc-dev 2021-06-09 17:15:44 +00:00
TreeHugger Robot
d07356b09c Merge "Proper retrying DL installation sessions." into sc-dev am: aea3115776 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14910490

Change-Id: Ibba68d6cb54d35ffa058b9c0c0873aa208477bd7
 2021-06-09 17:05:57 +00:00
TreeHugger Robot
e9504d4f48 Merge "Take a screenshot as soon as the phone unlocks" into sc-dev am: 900834f728 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14889011

Change-Id: I1232018866198dceab5696914bf9f600b27eae08
 2021-06-09 17:05:43 +00:00