Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
644,685 Commits 3 Branches 0 Tags
a4bea97be4bbb660bd51e588bc53d31e7b423e33
Commit Graph

644685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a4bea97be4 Merge "Hotword: Propagate the DSP DetectedResult." into sc-dev am: dfbde545f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427823

Change-Id: I6b27401db604eb10143912e457e94ff2ca4aec3e
 2021-06-09 22:36:45 +00:00
TreeHugger Robot
dfbde545f3 Merge "Hotword: Propagate the DSP DetectedResult." into sc-dev 2021-06-09 22:32:37 +00:00
James O'Leary
4084659caf Merge changes from topics "quantizer_improved_logic", "reintroduce_scaling_fixes" into sc-dev am: e0970984c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14802974

Change-Id: I99e2facf17062876ac1501384ddb9dbbd26a3ef8
 2021-06-09 22:30:49 +00:00
TreeHugger Robot
55b2f7c606 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: Ie20ee642abca2e72e3914679c9f84c46ae45bc97
 2021-06-09 22:30:14 +00:00
James O'Leary
e0970984c8 Merge changes from topics "quantizer_improved_logic", "reintroduce_scaling_fixes" into sc-dev 
* changes:
  Quantize image to 128 colors instead of 5
  Quantizer improvements
  Sort colors from high count => low count
  Don't interpolate image input to quantizer
  Cache set wallpaper as PNG instead of JPEG
  Only rescale wallpaper if its > display height
 2021-06-09 22:23:24 +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
7b9e7896e4 Merge "Revert zoom level" into sc-dev am: fe788b0b7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404

Change-Id: If7a4bdad09375da31bd293e4aa9dca07035e7c1d
 2021-06-09 20:41:18 +00:00
Xiaoyu Jin
2de7a96ff8 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: I6175267886bc9ba7f8754de00adf2a27bbed9b49
 2021-06-09 20:40:28 +00:00
Max Bires
d6d9f9e044 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: I1500cddd8be4def9b6080e8f6de0f4707a0e84da
 2021-06-09 20:39:57 +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
21e0f4137a 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: Iab4b7b45f08add806e3d082476f835dfdebc20cf
 2021-06-09 19:59:01 +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
3ec5783f20 [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: I6811a045f3c856c27e305b0a8f9c0c5f43a1e7e6
 2021-06-09 19:52:28 +00:00
Automerger Merge Worker
92a042d66a 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 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I880859b47f54a934d73ce4987208fe3f8d5ec10c
 2021-06-09 19:52:24 +00:00
TreeHugger Robot
0be9333849 [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: I874caef974f281ce6f0799aaeb31c2a0cda9c6fc
 2021-06-09 19:52:19 +00:00
Tej Singh
6fc08bbefd [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 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf655ea9bb14cf96c13fb2084131ed1ddce42ee6
 2021-06-09 19:52:12 +00:00
Xiaoyu Jin
138dc1ea4f 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: I1d66ce7f0ae6b1436bd22abe23909be849908c44
 2021-06-09 19:52:05 +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
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
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
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
49cfb97ac0 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: Ide3b5000b8dd695adda3ef84271de5cc11b713ab
 2021-06-09 19:30:27 +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
d190a4754e 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: I36d97bebc12b4d3ecafc83f6117b6f6967d61682
 2021-06-09 19:00:24 +00:00
Matt Pietal
ea43bd1b28 Merge "Controls spacing" into sc-dev am: 68db245507 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14919750

Change-Id: I166be025becc8d586832b74d06cf4f6e3d60f18c
 2021-06-09 18:52:59 +00:00
Ying Xu
fa85685345 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: I15166502ad462afd8df3b520e0c0aa33013f7d22
 2021-06-09 18:51:53 +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
23794f8632 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: I139d1a1e976f0acef06007442e1fc91f66dc97ba
 2021-06-09 18:05:37 +00:00
Mady Mellor
6de08c6165 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: I5705a6db65605c7b3c7ecba0164aa7c959891cd3
 2021-06-09 18:05:26 +00:00
Winson Chung
a9e03e665d 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: Id2dc2b634af4609b4b9b8f102ca4f17247c6f032
 2021-06-09 18:04:25 +00:00
Julia Reynolds
8c497473a0 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: Idb384f25f51a07c352b3c77df43edd20c20868bb
 2021-06-09 18:04:04 +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