Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,534 Commits 3 Branches 0 Tags
f8c331bc499178d30c753dd1fcd836302e446701
Commit Graph

641534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Meng Wang
f8c331bc49 Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev am: 6517e68d15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14163097

Change-Id: I4710b1aa328571550ecee6bea8fc1b4ca32a58c6
 2021-04-12 23:44:28 +00:00
Meng Wang
6517e68d15 Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev 2021-04-12 23:22:21 +00:00
Kevin Chyn
e6431059b2 Merge "Add logs when addAuthToken is invoked" into sc-dev am: 05a37fac59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162036

Change-Id: I9ab61c787a1cce9fc158f9bbe5039e52fbddd693
 2021-04-12 23:21:12 +00:00
Kevin Chyn
05a37fac59 Merge "Add logs when addAuthToken is invoked" into sc-dev 2021-04-12 23:02:38 +00:00
Jing Ji
202a83d445 Merge "Clear the pending app freezer task if it's killed." into sc-dev am: 6c524b8a10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143756

Change-Id: I9aeebbbb4dda2c788206693db3dd72afff10ceb9
 2021-04-12 22:59:54 +00:00
Jing Ji
6c524b8a10 Merge "Clear the pending app freezer task if it's killed." into sc-dev 2021-04-12 22:29:22 +00:00
Meng Wang
3c167fe9ca Revert "PasswordPolicy.getMinMetrics PIN" 
This reverts commit 8dd5021359.

Reason for revert: DroidMonitor: Potential culprit for Bug 185150796 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 185150796
Change-Id: Ie6809d9e20b5c32c076e7a790095c65a2295781a
 2021-04-12 22:26:57 +00:00
TreeHugger Robot
3af5184b5b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 650933432c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e6795c1a8384b5ca5f01f6320b2f4889ea2ede7
 2021-04-12 22:20:03 +00:00
Edgar Arriaga García
83e13b214d Merge "cleanups and fixes for process_madvise compaction" into sc-dev am: a7e2b44186 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14096835

Change-Id: If42e42e004c73df7ce61e9b1dac876617fc41884
 2021-04-12 22:19:53 +00:00
Beverly Tai
a600534d9e Merge "Use default font for clock font" into sc-dev am: 517485f893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162971

Change-Id: I9f565de18204e866150cc6b929c8b24b0838f27f
 2021-04-12 22:19:26 +00:00
TreeHugger Robot
47ec02b5bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours am: 361353f28b -s ours am: fd0773cb29 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc93735b84bac2c90ea8f2421b891403e2d30b96
 2021-04-12 22:19:03 +00:00
TreeHugger Robot
650933432c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-12 22:14:13 +00:00
Edgar Arriaga García
a7e2b44186 Merge "cleanups and fixes for process_madvise compaction" into sc-dev 2021-04-12 22:04:09 +00:00
Beverly Tai
517485f893 Merge "Use default font for clock font" into sc-dev 2021-04-12 21:55:26 +00:00
TreeHugger Robot
fd0773cb29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours am: 361353f28b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7c8372249f5087c8ae469144b09ec7448958a5f
 2021-04-12 21:53:40 +00:00
Chloris Kuo
13565a78a9 Merge "Fix NAS feedback UI debug info" into sc-dev am: 96ab6db65f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13978666

Change-Id: Ia33e48b30ce51d2bc6c611ec6b0dcc0de0bfe208
 2021-04-12 21:49:26 +00:00
Chloris Kuo
96ab6db65f Merge "Fix NAS feedback UI debug info" into sc-dev 2021-04-12 21:27:44 +00:00
Paul Duffin
f561dc966d Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f am: 78f9593ff7 am: f5195618f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: Ia5b31b5a858cc2e8c2037daa350f2d6c66a60c9e
 2021-04-12 21:24:06 +00:00
TreeHugger Robot
361353f28b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4c6eb66645745102f6ee818bd3694a87a98696d
 2021-04-12 21:23:25 +00:00
Paul Duffin
f5195618f8 Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f am: 78f9593ff7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: Ic3a1a3531016fa99e397a986bc05c2163d0f88bb
 2021-04-12 20:59:22 +00:00
Mike Reed
c80883cc60 Merge "hwui's own impl for interpolator" into sc-dev am: c5b6959fb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162470

Change-Id: Id83a0a8f195065db84835f2cad6e05ceed6f18d7
 2021-04-12 20:55:50 +00:00
Eugene Susla
88b7eb7662 Merge "Change associate return type to void" into sc-dev am: fc191ab4c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14068164

Change-Id: I3fbec9b94c98aff7dcb8c7d171343289c949035a
 2021-04-12 20:55:24 +00:00
Felipe Leme
de48cdeecc Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev am: 6ebf3703f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14130357

Change-Id: I32f98f893c1c18fb3f6a88dd1e46797f3feea006
 2021-04-12 20:54:49 +00:00
Silin Huang
27d52316fc Merge "Wallet card carousel screen UI polish." into sc-dev am: ce953e44cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14136605

Change-Id: I72fafcb59b5e7587784b6fecb57e8a20b07e7a6d
 2021-04-12 20:53:58 +00:00
Mike Reed
c5b6959fb9 Merge "hwui's own impl for interpolator" into sc-dev 2021-04-12 20:48:21 +00:00
Eugene Susla
fc191ab4c2 Merge "Change associate return type to void" into sc-dev 2021-04-12 20:46:46 +00:00
Bill Yi
a601628360 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5fe0501b894e17ebc5d63b02f911fc72e457d9a8
 2021-04-12 20:38:46 +00:00
TreeHugger Robot
b4c4f6d65e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 20:35:50 +00:00
Kevin Chyn
e4c593cc86 Add logs when addAuthToken is invoked 
Bug: 184804041
Test: Builds
Change-Id: I1eea05f8c7f45bb96790119c4b14bf436909af18
 2021-04-12 13:32:16 -07:00
Felipe Leme
6ebf3703f2 Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev 2021-04-12 20:29:04 +00:00
Silin Huang
ce953e44cf Merge "Wallet card carousel screen UI polish." into sc-dev 2021-04-12 20:20:47 +00:00
Lais Andrade
ef40d628b5 Merge "Rename CombinedVibrationEffect to CombinedVibration" into sc-dev am: 8b2586c6ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104345

Change-Id: I5b4d66ee7d5f284dcd55f0044bc249d3c6d46b9a
 2021-04-12 20:09:30 +00:00
Jiachen Zhao
82c4dfdb95 Merge "Addresses TODO in ResumeOnRebootService Javadoc" into sc-dev am: 7f188a9fa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14064873

Change-Id: If6ef427bd67244a73d16c2441a530bf407cf0247
 2021-04-12 20:09:11 +00:00
Paul Duffin
78f9593ff7 Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: I79c9c1803ac53db9966646436f9b1c329595ae8e
 2021-04-12 20:08:58 +00:00
TreeHugger Robot
2202e5d2ef Merge "Upgrading allowlist for calendar provider" into sc-dev am: c74ea74939 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145868

Change-Id: I608a488f4a117f5623eced47ceea4fd10b08d075
 2021-04-12 20:08:56 +00:00
Lais Andrade
8b2586c6ea Merge "Rename CombinedVibrationEffect to CombinedVibration" into sc-dev 2021-04-12 20:08:41 +00:00
Songchun Fan
afeca8affa Merge "[SettingsProvider] specify settings type in the comments" into sc-dev am: 1b689fe01b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145172

Change-Id: Ied6da50dc342f485513e830f959308e608189ea2
 2021-04-12 20:08:20 +00:00
Jiachen Zhao
7f188a9fa6 Merge "Addresses TODO in ResumeOnRebootService Javadoc" into sc-dev 2021-04-12 20:01:45 +00:00
TreeHugger Robot
c74ea74939 Merge "Upgrading allowlist for calendar provider" into sc-dev 2021-04-12 19:56:32 +00:00
Beverly
68d6e8ebb8 Use default font for clock font 
Note: currently the default is roboto and provides limited support
for variable fonts (ie: Latin numerals supported but other locales may
not be supported by default). This means in certain locales, the font
weight may not change between AOD and the lock screen. OEMs should be
aware that this may cause burn-in on AOD.

Test: manual
Fixes: 171376810
Change-Id: Icb61fec9636ebacec5b7c39492423a9d4bca07c1
 2021-04-12 19:34:40 +00:00
Paul Duffin
72b1ff135f Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: Id60304459924aa75456d167fe18091f91ff62851
 2021-04-12 19:29:12 +00:00
Songchun Fan
1b689fe01b Merge "[SettingsProvider] specify settings type in the comments" into sc-dev 2021-04-12 19:27:26 +00:00
Jay Aliomer
c4541e697d Merge "ImageWallpaper density and bug fix" into sc-dev am: fcfa35e119 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143034

Change-Id: I98da55db6eb12417844e4aab426878baf4272b90
 2021-04-12 19:09:57 +00:00
Siim Sammul
f72b2d109d [automerger skipped] Merge "Store the collected binder latency samples in buckets to form a histogram. Add the ability to generate histograms with varying bucket counts and sizes." into sc-dev am: 650d60ad01 -s ours 
am skip reason: skip tag Change-Id I58d3cbdd9ae43c8da121ec41d994b077e29bb371 with SHA-1 dcd3dc69a1 is already in history

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

Change-Id: Idd93aae2b5cb42dc41b61875bc8d6e721c2b182c
 2021-04-12 19:09:17 +00:00
TreeHugger Robot
3f0b802ad3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a700a70372 -s ours am: b778e99951 -s ours am: 6e3a221229 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I419448166540bd23a655f3d75ce01212937c9d8d
 2021-04-12 19:09:06 +00:00
TreeHugger Robot
16eaa498a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 27bb7521ba -s ours am: 559601bc20 -s ours am: 604cb1a687 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5744789d286db7070ba74484225293477c1e9eee
 2021-04-12 19:08:49 +00:00
Bill Yi
d8107bfbec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3058e21acf -s ours am: 758028b112 -s ours am: 33a65a6530 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62049d6dc6268d14f97afed7bc43772ce14bdffc
 2021-04-12 19:08:21 +00:00
Lucas Dupin
8dfd72766f Merge "New color spec" into sc-dev am: 76524088d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14143087

Change-Id: Icc252574b301ff3899182b47decd3cbf41804c1f
 2021-04-12 19:07:36 +00:00
Roshan Pius
500e40b044 Merge "base/wifi: Remove rpius@ from OWNERS" into sc-dev am: fd9477d782 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161456

Change-Id: Ic870079a362eb3877de2daec557185c7bb1348a0
 2021-04-12 19:06:50 +00:00
Eugene Susla
c248630cff Change associate return type to void 
Per API council feedback, since result wasn't meaningfully used

Fixes: 184264581
Test: presubmit

Change-Id: I65f2df6c2ce346c52cfc3f70d0ed8b63c41546d5
 2021-04-12 12:01:45 -07:00