Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
652,178 Commits 3 Branches 0 Tags
ba493abc66eb7e2fc69e402ca280c2da46fbd0c2
Commit Graph

652178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ba493abc66 Merge "Update the backgroud of checkbox for rotary" into sc-dev am: 2eda3de204 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14753063

Change-Id: Id9651f3ae8457d84705a928a8ff88c3540379f42
 2021-06-09 22:28:59 +00:00
TreeHugger Robot
2eda3de204 Merge "Update the backgroud of checkbox for rotary" into sc-dev 2021-06-09 22:11:06 +00:00
Lucas Dupin
06b6c7a31e Merge "Revert zoom level" into sc-dev am: fe788b0b7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404

Change-Id: Id7c50283c5ee813334bda4500624d56a8da47482
 2021-06-09 20:39:06 +00:00
Xiaoyu Jin
dd0a1e63ad Merge "Use AppSearchConfig in PlatformLogger" into sc-dev am: e298f682ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14709017

Change-Id: I11c3bb90e52bb3e413498ee880d2c671050bbda9
 2021-06-09 20:38:47 +00:00
Max Bires
0869ce1cfd Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev am: 8092f01ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923499

Change-Id: Id191cefe8c6591de8552705f627f06f9eeebe958
 2021-06-09 20:38:22 +00:00
Lucas Dupin
fe788b0b7b Merge "Revert zoom level" into sc-dev 2021-06-09 20:38:17 +00:00
Xiaoyu Jin
e298f682ca Merge "Use AppSearchConfig in PlatformLogger" into sc-dev 2021-06-09 20:26:47 +00:00
Max Bires
8092f01ce1 Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev 2021-06-09 20:21:15 +00:00
Andy Hung
cd3d8a5e44 Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7bf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904524

Change-Id: I897c85ab0ac22f333f70ba5e0bfa2a8a6dbfe06b
 2021-06-09 19:57:26 +00:00
Max Bires
56318a568f Revert "Fixing the race condition in GenerateRkpKey" 
This reverts commit d05498b9d8.

Reason for revert: Bugged on non-RKP systems.

Bug: 190222116
Change-Id: Ie7d17d4251c381c1bae6a76cd9b0246c551f8042
 2021-06-09 19:54:48 +00:00
Andy Hung
aadafc7bf2 Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev 2021-06-09 19:54:16 +00:00
TreeHugger Robot
c8c8965649 [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: I3cc057ab8235a7b137da7bc2f02901c35ac8f694
 2021-06-09 19:51:54 +00:00
Automerger Merge Worker
80d6480b40 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: I2946249b6a3787b952ae2dcfd79defa96dd011c1
 2021-06-09 19:51:46 +00:00
Tej Singh
10ecd59019 [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: I6d8e3eb75a995ff24739eba6f44ed4406b394636
 2021-06-09 19:51:44 +00:00
TreeHugger Robot
0add9afe0d [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: I243e29bcad2048acb72765f876bf075ec7ead45f
 2021-06-09 19:51:29 +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
7cdb4f59ca [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: Idb19fa7079cafe713c7dadd792757bc7eda5f9ed
 2021-06-09 19:51:21 +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
Xiaoyu Jin
b35156aa1c 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: I722136a525bb355284a79e9bf327e3d810c3338f
 2021-06-09 19:51:09 +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
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
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
TreeHugger Robot
38c190df2b 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: Ib316781bde65a608085533f2fad74154c5dd8e62
 2021-06-09 19:28:43 +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
Lucas Dupin
54d09e4352 Revert zoom level 
Bug: 189976220
Test: manual
Change-Id: I3b1595a905a2f079e144b33d25ea7c7c44526d30
 2021-06-09 12:07:44 -07:00
Steve Elliott
67d86e5c59 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: Id9b38d96fbbea5a7b722bf15df97a5050f839a62
 2021-06-09 18:49:37 +00:00
Matt Pietal
de976c60de Merge "Controls spacing" into sc-dev am: 68db245507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750

Change-Id: I3784c0eb369f04ed3ba38823e74aa09eceb47977
 2021-06-09 18:47:45 +00:00
Ying Xu
7fcb93bcc9 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: I48094963688bbdea2e0d21d8e86fc79c51d70a7d
 2021-06-09 18:44:46 +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
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
Anna Zappone
7570c1e35c 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: I77a9f89fdb9302f1f2cd7b39ec3a1e33f3eeebcb
 2021-06-09 18:04:15 +00:00
Mady Mellor
302ab063ec 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: Ic6001c06bd9ef857554224f5559701b1675c6851
 2021-06-09 18:03:45 +00:00
Winson Chung
63ab670350 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: Idcae736e4aa2cd8b1c433e635edb16783424d177
 2021-06-09 18:03:29 +00:00
Julia Reynolds
5cc7e146e4 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: I32a95286f3e9464128949a83194f7137d24ab66a
 2021-06-09 18:02:47 +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
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
Julia Reynolds
b87598c3cc Merge "Update logic about parent and convo channels" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
78e8d725fd 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: I392baf26e41ee088a1db9ceb730409f5d8319f72
 2021-06-09 17:20:22 +00:00