Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
639,087 Commits 3 Branches 0 Tags
8bd9bf4f7ecc381e8a4e61ba6ef3ae8023d1d1ae
Commit Graph

639087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Mitchell
8bd9bf4f7e Merge "Use staging-public-group in framework SDK" into sc-dev am: d4f0220d29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14021315

Change-Id: Id2b353a9d717daa7648f274d93198e7004a4a054
 2021-04-01 18:47:36 +00:00
Youngjun Kwak
e54af06ace [automerger skipped] Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev am: 3c8e090455 am: 7b8bf16a8e -s ours am: 782f9c081a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id6218865dc3130e39173afca845ffdb10853d443
 2021-04-01 18:46:45 +00:00
Youngjun Kwak
bc25b2ab37 [automerger skipped] Revert "DO NOT MERGE Remove focus on PasswordTextView" am: 44c4a7496e am: 6a2a673152 -s ours am: cce6056fec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I058acc80096bc29aef93c15ffd021960efdee6eb
 2021-04-01 18:46:42 +00:00
Ryan Mitchell
d4f0220d29 Merge "Use staging-public-group in framework SDK" into sc-dev 2021-04-01 18:36:33 +00:00
Youngjun Kwak
782f9c081a [automerger skipped] Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev am: 3c8e090455 am: 7b8bf16a8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I099a0038537c7b306042cc51605a5d69b4bc2c1a
 2021-04-01 18:32:18 +00:00
Youngjun Kwak
cce6056fec [automerger skipped] Revert "DO NOT MERGE Remove focus on PasswordTextView" am: 44c4a7496e am: 6a2a673152 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b67a3930605252c058c990b644489e6f13d602e
 2021-04-01 18:31:56 +00:00
TreeHugger Robot
b94f8fecdd Merge "Improve BiometricPrompt support for face + UDFPS" into sc-dev am: 41d65a1ba0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056925

Change-Id: I6b96fb46814dd52ddb3931a53a42f29624c19664
 2021-04-01 18:28:56 +00:00
TreeHugger Robot
41d65a1ba0 Merge "Improve BiometricPrompt support for face + UDFPS" into sc-dev 2021-04-01 18:11:19 +00:00
Rob Carr
2a4568d81e Merge "ViewRootImpl remove blur defer transacion" into sc-dev am: 194d95b130 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855849

Change-Id: I224214eeaab9c9fd8798b6576a053c5965a45f34
 2021-04-01 18:07:43 +00:00
Rob Carr
4026add768 Merge "WindowManager: Handle main window size change transaction with BLAST." into sc-dev am: 7783205079 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13855848

Change-Id: I260cf4a941bb6e7e45445eb46f0877a6619f0634
 2021-04-01 18:07:28 +00:00
Ben Lin
1d57a3b9aa Merge "PiP: Ensure PiP menu layout updates are on Shell main thread." into sc-dev am: 085035f9cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13933477

Change-Id: I4a45559f031872abe44dac4832273e4477176e59
 2021-04-01 18:06:39 +00:00
Rob Carr
194d95b130 Merge "ViewRootImpl remove blur defer transacion" into sc-dev 2021-04-01 17:55:06 +00:00
Rob Carr
7783205079 Merge "WindowManager: Handle main window size change transaction with BLAST." into sc-dev 2021-04-01 17:54:50 +00:00
Youngjun Kwak
7b8bf16a8e Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev am: 3c8e090455 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14040171

Change-Id: I1ae8b92156ba5a4e9ff46e68f3ba069b88e8f1ed
 2021-04-01 17:46:07 +00:00
Youngjun Kwak
6a2a673152 Revert "DO NOT MERGE Remove focus on PasswordTextView" am: 44c4a7496e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14040171

Change-Id: Ibc742115ba929cbb22ac2f004ad96c2e55f40852
 2021-04-01 17:45:54 +00:00
Ben Lin
085035f9cc Merge "PiP: Ensure PiP menu layout updates are on Shell main thread." into sc-dev 2021-04-01 17:44:52 +00:00
TreeHugger Robot
fa569d11ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 008e3b8034 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9b82a9636a4053c552d08f893749978a975a5a6
 2021-04-01 17:26:41 +00:00
Aaron Huang
b238e492d3 [automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc am: 5b1b6bf264 -s ours am: 4cbbf1aa6c -s ours 
am skip reason: skip tag Change-Id Ib667c115e5f1e01237d88b77bba753363da309cc with SHA-1 c03b2044dc is already in history

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

Change-Id: I01d6dd5f5f8d016871771529b6fbe2ce934bf8b3
 2021-04-01 17:26:30 +00:00
TreeHugger Robot
2043c30ace Merge "Add MODIFY_AUDIO_ROUTING permission to shell for CTS test." into sc-dev am: 34cfcb8226 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13959439

Change-Id: I2a54ba30ecac43b8de713a6620047bbf702c5819
 2021-04-01 17:25:42 +00:00
Dmitri Plotnikov
34297e2a3c Merge "Adjust total consumed power to avoid double-counting" into sc-dev am: 8b5679d534 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14023274

Change-Id: Ib81431d8437c6ed2aa1696a3d31c094b6351e931
 2021-04-01 17:25:27 +00:00
TreeHugger Robot
008e3b8034 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-01 17:25:10 +00:00
TreeHugger Robot
4d49a5b3e8 Merge "Use the text classifier in the right user" into sc-dev am: b012745bc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931230

Change-Id: Ibde9844e588b35725980734ffebd6071306c8af4
 2021-04-01 17:25:05 +00:00
Youngjun Kwak
3c8e090455 Merge "Revert "DO NOT MERGE Remove focus on PasswordTextView"" into rvc-qpr-dev 2021-04-01 17:11:33 +00:00
Aaron Huang
4cbbf1aa6c [automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc am: 5b1b6bf264 -s ours 
am skip reason: skip tag Change-Id Ib667c115e5f1e01237d88b77bba753363da309cc with SHA-1 c03b2044dc is already in history

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

Change-Id: Ia90d90c5bf7429ad2a7f50d6e055f6dec28f3ea9
 2021-04-01 17:09:23 +00:00
TreeHugger Robot
34cfcb8226 Merge "Add MODIFY_AUDIO_ROUTING permission to shell for CTS test." into sc-dev 2021-04-01 17:05:29 +00:00
Dmitri Plotnikov
8b5679d534 Merge "Adjust total consumed power to avoid double-counting" into sc-dev 2021-04-01 17:00:30 +00:00
TreeHugger Robot
408e17dd30 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-01 16:59:45 +00:00
TreeHugger Robot
b012745bc0 Merge "Use the text classifier in the right user" into sc-dev 2021-04-01 16:59:04 +00:00
Aaron Huang
5b1b6bf264 Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861

Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02
 2021-04-01 16:45:22 +00:00
Hui Yu
84e69e47c3 Merge "Exempt VPN apps from BG-FGS-launch restriction." into sc-dev am: 8d599ec08e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14039998

Change-Id: Idb3072e46fcdbe2a3bafcce061ba409a4107a834
 2021-04-01 16:44:51 +00:00
Beth Thibodeau
a09185a595 Merge "Add power menu lite" into sc-dev am: 6e967422ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13957886

Change-Id: I284a3e8d9fdc0f45d03d731764b33f99314d4fe5
 2021-04-01 16:43:15 +00:00
Hongwei Wang
23135f4758 Merge "Flicker test for PiP and launcher shelf height" into sc-dev am: 313a5ed5fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14055865

Change-Id: Id5c061e3f2202dc1c11c991e4bdc280ee32d8e08
 2021-04-01 16:42:53 +00:00
Hui Yu
8d599ec08e Merge "Exempt VPN apps from BG-FGS-launch restriction." into sc-dev 2021-04-01 16:41:40 +00:00
Curtis Belmonte
d1ae004bf0 Improve BiometricPrompt support for face + UDFPS 
On devices with an available face and UDFPS sensor, show a
BiometricPrompt that first attempts to authenticate with face, falling
back to UDFPS if unsuccessful. This change is UI-only for now, and
follow-up work will be needed to coordinate fallback behavior between
sensors, rather than running both simultaneously.

Test: atest com.android.systemui.biometrics
Test: Manually tested BiometricPrompt on device

Bug: 172376593
Bug: 183220060
Change-Id: Ia128e97d2d831d14420ec015f32eaa589b8c38cd
 2021-04-01 09:34:37 -07:00
Beth Thibodeau
6e967422ca Merge "Add power menu lite" into sc-dev 2021-04-01 16:28:30 +00:00
Hongwei Wang
313a5ed5fa Merge "Flicker test for PiP and launcher shelf height" into sc-dev 2021-04-01 16:26:44 +00:00
Aaron Huang
40b438abcc Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861

Change-Id: I1a21497634c2ee53abfca8dea4b8bab40cf28b3a
 2021-04-01 16:25:44 +00:00
Jeff DeCew
61528e8bff Merge "Remove unused code" into sc-dev am: 2016350655 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14020327

Change-Id: I37c8544fc8370ca0c682d0c4a77edd1643e59a42
 2021-04-01 16:24:37 +00:00
Jeff DeCew
2016350655 Merge "Remove unused code" into sc-dev 2021-04-01 16:24:26 +00:00
Miranda Kephart
a33be93c11 [automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev am: 637a90a745 am: b7ee17360d -s ours am: 4fd98847ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia202b802d79b33793c919531a20acdfc9a549905
 2021-04-01 16:24:20 +00:00
Miranda Kephart
3901c84e5a [automerger skipped] [DO NOT MERGE] Make PendingIntents in screenshots immutable am: cdd1d2a4fe am: fe43075ab2 -s ours am: aa6e043a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac7823ff7321b919017c31604471048ce5359f3a
 2021-04-01 16:24:17 +00:00
Miranda Kephart
4fd98847ac [automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev am: 637a90a745 am: b7ee17360d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ff7f4850eae62607ffdbc0000da46bb7506fd68
 2021-04-01 16:07:45 +00:00
Miranda Kephart
aa6e043a4d [automerger skipped] [DO NOT MERGE] Make PendingIntents in screenshots immutable am: cdd1d2a4fe am: fe43075ab2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3a9be05b6c8123e104e1c2996e8f087135a8f51
 2021-04-01 16:07:36 +00:00
TreeHugger Robot
0d7858d54e Merge "Add label to long screenshot share" into sc-dev am: 44f3c36307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14065845

Change-Id: Ib8f761e841f1149454b78f2ba643d8800d6a67e1
 2021-04-01 16:06:53 +00:00
Ytai Ben-tsvi
f611d0a462 Merge "Reduce severity of SoundTriggerService error messages" into sc-dev am: 322aa5763b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14056378

Change-Id: Ib999f1ff8943394b7df160b7c759346ebe35b3de
 2021-04-01 16:06:33 +00:00
Miranda Kephart
0af4d5712d [automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-dev am: 637a90a745 am: fe4462eecb am: 09202a9318 -s ours am: bbb17ae4f0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I122a3c2823a900257f17dd99f8ae3453bd6d1803
 2021-04-01 16:06:25 +00:00
Miranda Kephart
b50a40513d [automerger skipped] [DO NOT MERGE] Make PendingIntents in screenshots immutable am: cdd1d2a4fe am: 22945b7673 am: f511fd9335 -s ours am: 267bd2e0cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I453e25b00af42d0034de6415e43a720bc77976d1
 2021-04-01 16:06:22 +00:00
Miranda Kephart
52d6b73903 [automerger skipped] Merge "[DO NOT MERGE] Make PendingIntents in screenshots immutable" into rvc-qpr-dev am: 1672873e27 am: 14dc2300f1 -s ours am: ee0b136e81 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e977f753957baec533a4ca5332e14fd3c48be49
 2021-04-01 16:05:24 +00:00
Miranda Kephart
2130526ad0 [automerger skipped] [DO NOT MERGE] Make PendingIntents in screenshots immutable am: 1656070996 am: 6867761f8a -s ours am: 0456b39d2e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d92afbfc48620389acb0c8dfdc7a95e01031442
 2021-04-01 16:05:21 +00:00
Treehugger Robot
8db0ebc154 Merge "Update OWNERS for OnReceiveContentListener and ContentInfo" am: 2990dccc16 am: 736e5ea3a5 am: 838aff1230 am: 274a76464c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661118

Change-Id: I3c29e64103b04dfe48ae8021c7cfc880dd7f1e38
 2021-04-01 16:04:46 +00:00