Commit Graph

658087 Commits

Author SHA1 Message Date
Jay Patel
212904c773 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e4409e6b7e am: 87b9f9f432 am: 76d355e5a2 am: 91b768452f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Ib49c52fe6c504a9a17d3b05a05d4fd92e2adaa5e
2021-05-19 22:23:54 +00:00
Jay Patel
dbd804f3fe Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: e71830dafc am: 645e8be668 am: afc5cd5ff5 am: d1ab5c4639
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: Idc2c3c04ebcd5535ad3e35f310ae5fe102ee88d6
2021-05-19 22:23:24 +00:00
Jay Patel
d7ec9ed179 Merge "Merge "AudioSystem: update framework channel capabilities" am: 249034de9d" into stage-aosp-master am: 3036d7bf83 am: b56a9f0a05 am: 8a113a0ab4 am: fc21b8ee88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317754

Change-Id: I614060b13cc04fb729f89389520e7b0dbf515ecd
2021-05-19 22:22:58 +00:00
Automerger Merge Worker
6c561a9a5a Merge "[automerger skipped] Ensure storage permission revoke happens for all users am: 387182eb49 am: 2f2fa37a18 -s ours am: ccf88a6577 -s ours am: f498567ea3 -s ours am: 4bca56e7af -s ours" into sc-dev am: f2054d6897 -s ours am: 38dc8f9325 -s ours
am skip reason: Merged-In Ieb8bb9cde1576e9eee131338d393b8a3528341ec with SHA-1 8a1085bdcb is already in history

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

Change-Id: I51ee51206543330a80a769d43de1da6bd18c73a0
2021-05-19 22:22:36 +00:00
Winson Chiu
52501004f6 Merge "Print minExtensionVersions to Settings package dump" into sc-dev am: b12c5458de am: 26a87e5994
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14535290

Change-Id: Id2a2e88ec623000c45ebb35f0e1c80c956b3fa2a
2021-05-19 22:22:02 +00:00
Louis Chang
3d7bd8685d [automerger skipped] Merge "Detects all activities for whether showing work challenge" into rvc-qpr-dev am: 8e9e41c0f1 -s ours am: 57db689823 -s ours am: 846ef0e291 -s ours am: 27a686c88a -s ours
am skip reason: Merged-In I5e09b09be547d04fdfd709cb9cd4bcd4a94bbf21 with SHA-1 87fa64ebe4 is already in history

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

Change-Id: I91c644e95eda71d5abff5a4f29cd2430a0133996
2021-05-19 22:21:46 +00:00
TreeHugger Robot
58cab945df Merge "Reset pending oomadj target list after oomadj update" into sc-dev am: f012f6f780 am: 9561023582
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543265

Change-Id: I0e8fc09a3fc3b869d8d2728612f9a3443113539c
2021-05-19 22:20:38 +00:00
Tracy Zhou
6261d7746d Merge "Revert "Allow pulling down the status bar in visual immersive mode"" into sc-dev am: ccbd8e1d02 am: 3a993b61c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550642

Change-Id: Icecde9bc2fac37bd5f83c163e97bc8a7f39b16e0
2021-05-19 22:20:16 +00:00
Nader Jawad
321ac72f74 Merge changes I0b36f486,Ida0d0dee into sc-dev am: 40943ec440 am: 71dbd0646c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14542050

Change-Id: If9b48f3633364540bd6b61b7b55cd97d920530b1
2021-05-19 22:19:59 +00:00
Greg Daniel
5541a974b1 Merge "Add a mutex to VulkanManager::initialize." into sc-dev am: 830db628b8 am: b0a6cbdfa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14548617

Change-Id: I928bcf4fedb50f2ef590cfe24586e3727cb24b56
2021-05-19 22:19:33 +00:00
TreeHugger Robot
dfca9aba84 Merge "Close FDs even when throwing SecurityException." into sc-dev am: d285109ef2 am: 33f9edcc89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14538250

Change-Id: I394836d1fd596ae4631315a4fb4994aa215d3426
2021-05-19 22:19:11 +00:00
Gavin Corkery
115b7635cb Merge "Add per-file bugreporting OWNERS" am: 324a5e53a9 am: 589f728b5a am: b81e3635e3 am: f8b9d5cd0b am: 325d932d25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706699

Change-Id: I33e00a212f7ae5f9b64292519ebfdc5e08a786a1
2021-05-19 22:18:53 +00:00
TreeHugger Robot
7a721d60d9 Merge "Add validity check to detect invalid PDUs." into sc-dev am: 54b18bd8e8 am: 8f7a9d5b7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14523947

Change-Id: I296e7be2f9d1ed95a28adab8abc19813620a7a4c
2021-05-19 22:11:39 +00:00
Chavi Weingarten
5ea5239656 Merge "Add CAPTURE_BLACKOUT_CONTENT permission" into sc-dev am: 1b0e20108d am: 550c6bad93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14334266

Change-Id: I283645dd1052b26f23a6f7d522a56b47aae47a53
2021-05-19 22:11:25 +00:00
Steven Ng
3e0eb011bf Merge "Update widget suspended layout" into sc-dev am: 8de89d0fb8 am: 5e1187a3ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519407

Change-Id: I67a18388334f385a51585b96805d28d6b62abd67
2021-05-19 22:11:11 +00:00
Ahaan Ugale
b222dbf6f2 Merge "Make InputMethodInfo#showInInputMethodPicker public." into sc-dev am: 6bf4cb6147 am: 71fe6e9635
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489960

Change-Id: I7f54b59fc9d8436760f15629b52c97251b98d29e
2021-05-19 22:10:56 +00:00
Ming-Shin Lu
0ef5bcbb43 Merge "Remove updateImeParent in RecentsAnimationController" into sc-dev am: c0b5d73b18 am: f0e2afa816
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14295866

Change-Id: I01acde0b422bddd46fbdd3333d9d86f077023f24
2021-05-19 22:10:42 +00:00
Fiona Campbell
2c81bf6f6c Merge "Use config.xml as brightness default fallback." into sc-dev am: 2188e52237 am: 26cfea559d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530953

Change-Id: If21da77faf1371c3d13e81e81db0f509bc435938
2021-05-19 22:10:29 +00:00
Arthur Hung
731da9204d Merge "Add debug log for long press power" into sc-dev am: 9934d807f9 am: 3045d184eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514112

Change-Id: Ib1b7f0c5ab1d5dc080201574562064f1e46ddbb4
2021-05-19 22:10:15 +00:00
Lucas Dupin
db43607292 Merge "[ANR] Read device icon on the main thread" into sc-dev am: 1ecac1ab60 am: ea88d9680c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14461326

Change-Id: Idf362e4f7f65f57f49e9ea2b281e6fa1e31e14f2
2021-05-19 22:10:01 +00:00
Beth Thibodeau
904e89f580 Merge "Update resume icon and colors" into sc-dev am: ff15f21812 am: 581472eaad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14534168

Change-Id: I5b03b0584b084bf7bda447ea9a083a54031df17b
2021-05-19 22:09:49 +00:00
TreeHugger Robot
3f67afb8e0 Merge "Fix ColorFade would be cut when turn off screen in landscape" into sc-dev am: c19e092bc5 am: f6bffe561b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14516714

Change-Id: Id5d7ca5ab6ecc23e71a4ae3898f3d28b3e219456
2021-05-19 22:09:35 +00:00
Jamie Garside
becb5c5704 Merge "Renamed enableOneHandedBouncer to enableDynamicKeyguardPositioning." into sc-dev am: f24f5c508d am: 6e6073d46e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14340808

Change-Id: I6ad7f3a03943c28fac170c69576affdb3f0b0a91
2021-05-19 22:09:21 +00:00
Lee Shombert
0e3d743895 Merge "Fix ClassCastException in WatchedIntentResolver" into sc-dev am: 5677d2e417 am: 3483879e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14508394

Change-Id: Iae901a244949a529af99693fb29548a52d9a426e
2021-05-19 22:09:05 +00:00
TreeHugger Robot
c2b1f7c524 Merge "Don't allow non-system window overlays for bug report warnings." into sc-dev am: f477c8fb75 am: feaac36952
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14518596

Change-Id: I7684d51bc3e4a6eca893516518cee9b9f826dd29
2021-05-19 22:08:51 +00:00
Ricky Wai
842de0c171 Merge "Revert "Change mounting storage data and obb flag to on by default"" into sc-dev am: 1d42095ddb am: 65506c6616
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536504

Change-Id: I74db3df0d425143fb17f7818ca34302281a2224a
2021-05-19 22:08:36 +00:00
Matt Pietal
0b9cf50626 Merge "Wallet - Listen for setting changes" into sc-dev am: 989ea6ebda am: d94e01706f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14487716

Change-Id: If73bcaa98d04cf67d775826cc3c31b8f90485fbe
2021-05-19 22:08:20 +00:00
Ming-Shin Lu
650d948927 Merge "Fix some IME transition issues" into sc-dev am: 66dc0f32ed am: f8ea00afc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14455599

Change-Id: I6e10a4aba0b1550e7fbcf0a3e3492e4831e67920
2021-05-19 22:07:59 +00:00
Beverly Tai
b7d8100539 Merge "Immediately trigger face-auth on udfps bouncer" into sc-dev am: 7078fbe43c am: e3c822cfb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14534362

Change-Id: Ic246efc9f1094efd19c3ac26a48893f62992b15c
2021-05-19 22:07:45 +00:00
Junyu Lai
0dd4c5b319 Merge "[FUI26] Address comments on aosp/1560408" am: c1e493f98d am: 1befdd5001 am: c25bc707bc am: e36778ea6d am: 61d0ea1660
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845

Change-Id: Ib77ec78cb67c6afef0cf5b41c0037a73c01fecdd
2021-05-19 22:07:31 +00:00
Caitlin Cassidy
ee2ce53ca8 Merge "[Ongoing Call Chip] Ensure the chip is at least 48x48dp for accessibility." into sc-dev am: b8f98cfd7b am: 72cf49f29e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14517587

Change-Id: Ic0e19e5e77ff13ec7b566fa733e8e4ceb38ee116
2021-05-19 22:07:12 +00:00
Caitlin Cassidy
7842323d60 Merge "[Ongoing Call Chip] Remove the chip when an ongoing call notification is updated to a non-ongoing call notification." into sc-dev am: 168ba65337 am: eae4ab22d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14505597

Change-Id: I38d648b01202fbe81440f046470f262dd0524b93
2021-05-19 22:06:58 +00:00
Paul Hu
8d019004db Merge "Address [set|get]RestrictedAllowedApps API review feedback" am: f9dc4b0f52 am: bdf47a1733 am: cba89e7880 am: da2036bc8d am: 49d048fd79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708327

Change-Id: I8e5778f62eb083c66cb96abf6123864b077dedf5
2021-05-19 22:06:43 +00:00
TreeHugger Robot
82f50301f8 Merge "Move connectivity test defaults to tests/common" into sc-dev am: 5b9eeaa231 am: 68cbbdc641
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543666

Change-Id: If6b43c414e102b7a2bd01d8effa54eef7dae4f05
2021-05-19 22:06:24 +00:00
Aaron Huang
8919fa5626 [automerger skipped] Merge "Rename *Iface* APIs to *Interface*" am: f281058618 am: 27d2960c50 am: 06e89d6c3b -s ours am: a9d2d9a81d -s ours am: 3da57cc6e7 -s ours
am skip reason: Merged-In I38b476e762fb57fa88c4a789092d0af6f5330d80 with SHA-1 a10cc3aa60 is already in history

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

Change-Id: I0d8478adc1fafa9859ed16fa64b85a9aacfe5dd8
2021-05-19 22:06:12 +00:00
Treehugger Robot
e3a154eda6 Merge "Reference unreachable netId from INetd" am: da4644daf7 am: 99f78a5484 am: 8d8a727cf7 am: f0f896a0e4 am: 6147d0838d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708326

Change-Id: I5b45d65f28f18c3be28f03c584679cbca3f08560
2021-05-19 22:05:54 +00:00
TreeHugger Robot
3c1ea7ad0f Merge "Address comments on ag/14486203" into sc-dev am: dc9b300cf3 am: a672331128
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540395

Change-Id: I5fd3ad55d417f46024ed0cebd35f16633e8ec624
2021-05-19 22:05:35 +00:00
Chiachang Wang
84bd41d58f Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 1595a20d56 am: a999e5a2e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14514111

Change-Id: I9626c027a69489277db4a8a160ca19a3195dd48d
2021-05-19 22:05:21 +00:00
Pierre Barbier de Reuille
b30249233a Merge "Test color mapping equivalent in O(n)" into sc-dev am: 429e2a8b6a am: b4c170f5d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14518395

Change-Id: Iddc3fd90be5c928feae5b080c5bac760f21cd001
2021-05-19 22:05:07 +00:00
TreeHugger Robot
702d1501ae Merge "Read device types from ro.hdmi.cec_device_types." into sc-dev am: 54580d720d am: b6bbc46341
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443438

Change-Id: I5982947fbf1ac2e68e404fae33ecd57ae96ceacd
2021-05-19 22:04:54 +00:00
TreeHugger Robot
8e95f302f1 Merge "Exit dream mode on CEC wake message received" into sc-dev am: a31ca4d9d6 am: 57326ba651
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14466779

Change-Id: Ib8b71f5761182422c740d487df1f107aed216c9e
2021-05-19 22:04:39 +00:00
Chalard Jean
38e8d337e4 Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev am: 544e424124 am: d1b0a86a7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486203

Change-Id: I97c89b6e5879f468955eb7801b182ff5f8ca12e4
2021-05-19 22:04:25 +00:00
Tracy Zhou
2b08238e6a Merge "Allow pulling down the status bar in visual immersive mode" into sc-dev am: 6b78883298 am: b1d3cfbe78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13513299

Change-Id: I28a25049178a6d695a92f362cc777ef5899911b7
2021-05-19 22:04:08 +00:00
Jason Chang
0bcc401e1e Merge "(1/n) Disabling OHM gesture in NavigationBar 3 Button mode" into sc-dev am: e8b62e4d23 am: 959b5210c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14185029

Change-Id: Ifdb8b90839bec485271b429204d5d8256b239cae
2021-05-19 22:03:55 +00:00
Remi NGUYEN VAN
715d66a0a2 [automerger skipped] Merge "Move NetIdManager, ProfileNetworkPreferences" am: e0316b6018 am: d461929832 am: 89b5529da3 -s ours am: eb84dceae3 -s ours am: 1766597148 -s ours
am skip reason: Merged-In I454e8a0a8d0e0f9e6d21a8e8faf5a9e299962ad4 with SHA-1 5625b1f3c6 is already in history

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

Change-Id: I30b3ede253f3ecd5b762894af0308a0219c9cf46
2021-05-19 22:03:37 +00:00
Treehugger Robot
b413019851 [automerger skipped] Merge "Move connectivity sources to packages/Connectivity" am: b249b941ee am: 3eea8f3546 am: 0f8964439a -s ours am: 3699f612ff -s ours am: 5278849d4c -s ours
am skip reason: Merged-In I26d1a274058fa38763ad4f605549d880865b4d76 with SHA-1 9bf30999cc is already in history

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

Change-Id: I968cb1e75a141b4d6ab32b94a1df5a00d6de8a4b
2021-05-19 22:03:18 +00:00
Riddle Hsu
d7c304658b Merge "Minor cleanup of Task" into sc-dev am: 24367cc06c am: 839fcd0f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14522580

Change-Id: I80a6addd7491ffb1c8917a5da5d9ae644d0b215e
2021-05-19 22:03:00 +00:00
Jing Ji
08968e7d37 Merge "Handle the AM error dialogs in system UI thread" into sc-dev am: 75e3baedbb am: 28d7e404f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14537657

Change-Id: Ice43b79ee7e2f19f04281179b5200d78ef0a66f7
2021-05-19 22:02:47 +00:00
Hui Yu
43f13c4e97 Merge "Scan the downstream apps while updating oomadj for pending records" into sc-dev am: 19e79e066e am: 4478771cff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14535946

Change-Id: I5ff34886b626fdaf4e98e360a40e1b6b593171b0
2021-05-19 22:02:31 +00:00
Chris Li
246e3ddaf9 Merge "Determine whether to support activities in multi window (7/n)" into sc-dev am: da4381222a am: a6d0e667b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14427494

Change-Id: Ifa3ca29ca1cd69626bb2e9b8d39b08e7be38516d
2021-05-19 22:02:18 +00:00