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

646271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
40d596ee7f Fix regressions with reparenting task am: 27475c6e0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14914910

Change-Id: I70698c2bb96c2f620e112eed7ce15a88ce1e2592
 2021-06-10 00:50:19 +00:00
Winson Chung
27475c6e0c Fix regressions with reparenting task 
- Make the new task immediately visible, and reset the crop on the
  original task transferred from the leash

Fixes: 190550846
Test: Open ApiDemos, autoenter from a task with multiple activities

Change-Id: I2527cee68448dc8f1be7634051547c29c596c63a
 2021-06-10 00:33:30 +00:00
Sarah Chin
21945f3ee8 [automerger skipped] Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" am: 286416d8d2 am: 04e5006c89 -s ours 
am skip reason: Merged-In I25f1b05c505ec6631efa742c3da4bea5e6cdd28a with SHA-1 1e3717ef0d is already in history

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

Change-Id: Ie9e4f5e5dfe93251b6ab79c7e5e4ba6ea92b70e3
 2021-06-09 23:51:54 +00:00
Josh Tsuji
faeb08e452 Merge "Fix issue where notifications are visible during screen off if bypass is enabled." into sc-dev am: f3f485c453 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904072

Change-Id: Iff791679ab696627f4465607f7fdd2cbd06ca101
 2021-06-09 23:50:11 +00:00
Josh Tsuji
f3f485c453 Merge "Fix issue where notifications are visible during screen off if bypass is enabled." into sc-dev 2021-06-09 23:35:21 +00:00
Sarah Chin
04e5006c89 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" am: 286416d8d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1731951

Change-Id: I0c8bbaf282815a3a57a674a61008ae9f91ffc468
 2021-06-09 23:23:46 +00:00
Max Bires
06420260b9 [automerger skipped] Merge "Revert "Fixing the race condition in GenerateRkpKey"" am: 17f9f3e8b5 am: 55525e68c8 -s ours 
am skip reason: Merged-In I917a61da612f21f9a0f783bea5d24270d4e1db42 with SHA-1 d05498b9d8 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I0145f6151e2b21de41902687f83a3486c8a94aa9
 2021-06-09 23:10:18 +00:00
Sarah Chin
286416d8d2 Merge "Add CAPABILITY_PHYSICAL_CHANNEL_CONFIG_1_6_SUPPORTED" 2021-06-09 23:06:34 +00:00
TreeHugger Robot
6e24cfa824 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: I284512efffd1b874b35be4479a7a8b92807a6d7c
 2021-06-09 22:46:38 +00:00
Max Bires
55525e68c8 Merge "Revert "Fixing the race condition in GenerateRkpKey"" am: 17f9f3e8b5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1732234

Change-Id: I978fc369febd82b44094d716601a779aac6fc91e
 2021-06-09 22:46:24 +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
dc4c3fbc4b 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: I85e5f01f2a1ca271a779ea251613dcee87dc16da
 2021-06-09 22:29:34 +00:00
TreeHugger Robot
71a9987c14 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: I47734451194670be493e600615b6036835a4ed9e
 2021-06-09 22:29:03 +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
bd6bfdac5e Merge "Revert zoom level" into sc-dev am: fe788b0b7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921404

Change-Id: Ie7b26966501ab49ad5fc0c535f22752ea67f6eab
 2021-06-09 20:38:51 +00:00
Xiaoyu Jin
841b487089 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: Ief964e44e21893c0dc259650384b04bc44e41956
 2021-06-09 20:38:34 +00:00
Lucas Dupin
fe788b0b7b Merge "Revert zoom level" into sc-dev 2021-06-09 20:38:17 +00:00
Max Bires
8c2eeaae0a 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: I07ed945f0cf041f3178540945b53a4e247fc5957
 2021-06-09 20:38:15 +00:00
Max Bires
17f9f3e8b5 Merge "Revert "Fixing the race condition in GenerateRkpKey"" 2021-06-09 20:35:23 +00:00
Xiaoyu Jin
e298f682ca Merge "Use AppSearchConfig in PlatformLogger" into sc-dev 2021-06-09 20:26:47 +00:00
Max Bires
b2a11d35e5 Revert "Fixing the race condition in GenerateRkpKey" 
This reverts commit 0f62195535.

Reason for revert: Breaks non-RKP systems

Bug: 190222116
Change-Id: I7e31a3045caa7b8bb0e34c8d1e266c104a627324
Merged-In: I7e31a3045caa7b8bb0e34c8d1e266c104a627324
 2021-06-09 20:21:41 +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
aac17bd155 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: I1d62b83345eff4f838c3503132a2d87a1730215d
 2021-06-09 20:04:31 +00:00
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
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
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
Lucas Dupin
54d09e4352 Revert zoom level 
Bug: 189976220
Test: manual
Change-Id: I3b1595a905a2f079e144b33d25ea7c7c44526d30
 2021-06-09 12:07:44 -07: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