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

641490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jay Aliomer
fcfa35e119 Merge "ImageWallpaper density and bug fix" into sc-dev 2021-04-12 18:53:06 +00:00
Siim Sammul
650d60ad01 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 2021-04-12 18:49:27 +00:00
TreeHugger Robot
6e3a221229 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a700a70372 -s ours am: b778e99951 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: I72f0f479e5168f5809e3a1a4d227b891d419dc32
 2021-04-12 18:47:30 +00:00
Lucas Dupin
76524088d0 Merge "New color spec" into sc-dev 2021-04-12 18:38:14 +00:00
Roshan Pius
fd9477d782 Merge "base/wifi: Remove rpius@ from OWNERS" into sc-dev 2021-04-12 18:36:22 +00:00
Songchun Fan
468b77cfad Merge "Revert "[SettingsProvider] remove in-lock calls to PackageManager.getPackageUid()"" into sc-dev am: c05712b927 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161297

Change-Id: Ib5baf40b5fcfb5a10b1dfa8678e1b5d0d6b55c17
 2021-04-12 18:22:47 +00:00
Hui Yu
34d8240730 Merge "Background location permission should elevate the standby bucket to FREQUENT" into sc-dev am: 410c2bfeb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14057492

Change-Id: I3c459213310a6af26d2e6b32cdd8b8ebe05dbaea
 2021-04-12 18:22:32 +00:00
TreeHugger Robot
e06c43787a Merge "Fix consumption multiplier" into sc-dev am: c66db32d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14078195

Change-Id: If65d97d8ac5ab4029555925cff4f4f1046235391
 2021-04-12 18:22:17 +00:00
Xiaoyu Jin
31e2a2e01a Merge "Use the PlatformLogger in the platform" into sc-dev am: 6d44d9606d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13869731

Change-Id: I6cd86c4077ccf5ebf72410d022e3556cdc002d26
 2021-04-12 18:21:47 +00:00
Songchun Fan
c05712b927 Merge "Revert "[SettingsProvider] remove in-lock calls to PackageManager.getPackageUid()"" into sc-dev 2021-04-12 18:18:27 +00:00
Hui Yu
410c2bfeb8 Merge "Background location permission should elevate the standby bucket to FREQUENT" into sc-dev 2021-04-12 18:11:29 +00:00
TreeHugger Robot
c66db32d3b Merge "Fix consumption multiplier" into sc-dev 2021-04-12 18:08:52 +00:00
Xiaoyu Jin
6d44d9606d Merge "Use the PlatformLogger in the platform" into sc-dev 2021-04-12 18:04:09 +00:00
Roland Levillain
d07546a852 Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202 am: 87744c8b58 am: 1e3aafb013 am: 9e2adae46b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: Ic1f6e01b966ad1f29982390b49556b588f549ac5
 2021-04-12 18:03:16 +00:00
Paul Duffin
5307905476 Merge "Enforce formatting of bp files on repo upload" am: 8a8b0e9525 am: 58554cc6c7 am: de8564427b am: ba877fcf63 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671837

Change-Id: I831e3dabff1cb8b43f800ed12a973b27681a07ae
 2021-04-12 18:02:32 +00:00
TreeHugger Robot
b778e99951 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a700a70372 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbaa5b4ac82f9904e9f293195050883e4763e041
 2021-04-12 18:02:03 +00:00
TreeHugger Robot
559601bc20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 27bb7521ba -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90c8ba458dcb20c20a56ae2c52a00d3c32158c44
 2021-04-12 18:01:36 +00:00
Bill Yi
758028b112 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3058e21acf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6190a484ef2ea87a053a871ca6def2f70d518e85
 2021-04-12 18:01:12 +00:00
Bill Yi
72328e5193 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72ec86efb3 -s ours am: eb386f12dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida86fafe50fd98cd8dbf81e423e48e9529b18f9e
 2021-04-12 18:01:11 +00:00
zhaojiac
47b9ccdf1c Addresses TODO in ResumeOnRebootService Javadoc 
Also add service owners

Change-Id: I7669bbfc3975c164e773b9517dde5e3437b2fc1a
Bug: 184151180
 2021-04-12 17:56:41 +00:00
Roshan Pius
a16d0b3ac1 base/wifi: Remove rpius@ from OWNERS 
Bug: 184966495
Test: N/A
Change-Id: I3da6d876d330db51e506c75a00124b42d1efd1a6
 2021-04-12 17:55:12 +00:00
Roland Levillain
9e2adae46b Merge "Fix typo in documentation of ZygoteCommandBuffer.nativeForkRepeatedly." am: 304329d202 am: 87744c8b58 am: 1e3aafb013 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673345

Change-Id: I8ed55afb37e23af6c9190eed535b2f2ae1424890
 2021-04-12 17:46:03 +00:00
Paul Duffin
ba877fcf63 Merge "Enforce formatting of bp files on repo upload" am: 8a8b0e9525 am: 58554cc6c7 am: de8564427b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671837

Change-Id: I0594c1f748a48859c26875c58840c329309ff83d
 2021-04-12 17:45:42 +00:00
Bill Yi
eb386f12dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72ec86efb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80e3351409a2c45a803e49e6291bb5c696fc10d1
 2021-04-12 17:44:40 +00:00
Beverly Tai
8bba6c1b5b Merge "Update KeyguardIndicationController" into sc-dev am: d1a2b57de3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14142938

Change-Id: I6437bd0a0e91dc58c3aa75e4b2bd12d118a222c3
 2021-04-12 17:44:08 +00:00
TreeHugger Robot
efcc31668e Merge "Delay gesture processing in FalsingCollector." into sc-dev am: 77b662231e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14145867

Change-Id: I96dac3b1db969f8240c45e4a24c7a0ed20548a9d
 2021-04-12 17:43:36 +00:00
Chloris Kuo
fa06698519 Merge "NAS Settings Migration" into sc-dev am: cfab1005d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931022

Change-Id: I44e2ceb029c6b69aacc921c3ac69d925352c3456
 2021-04-12 17:43:18 +00:00
TreeHugger Robot
2432406ec8 Merge "Restrict QS container to avoid nav bar insets" into sc-dev am: e781c3fb2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140362

Change-Id: I1ea9d4d44ed9ee2e7906d53b5535fc915bf53a61
 2021-04-12 17:41:56 +00:00
Anton Hansson
a452d96632 Merge "Update references incompatibilies files" into sc-dev am: 6b0e5aa9d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14141615

Change-Id: I5b281f63c805a91f7334ddf51695572ed3cbd29f
 2021-04-12 17:41:27 +00:00
Beverly Tai
d1a2b57de3 Merge "Update KeyguardIndicationController" into sc-dev 2021-04-12 17:36:02 +00:00
TreeHugger Robot
77b662231e Merge "Delay gesture processing in FalsingCollector." into sc-dev 2021-04-12 17:34:29 +00:00
TreeHugger Robot
a700a70372 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 17:25:34 +00:00
TreeHugger Robot
27bb7521ba Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 17:25:03 +00:00