Commit Graph

658306 Commits

Author SHA1 Message Date
Soonil Nagarkar
ec54079e9d Merge "Add support for excluding tags from restrictions" into sc-dev am: fe40442304 am: b2ea76cc02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14503384

Change-Id: If836e070472cfe80f701313537abe5ab8dd43639
2021-05-19 23:18:40 +00:00
Neil Fuller
733f3dbed6 Merge "Add device_config cmds for disabling syncs" into sc-dev am: 9f47ce098b am: 081472b391
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14426683

Change-Id: Ia542ac632f2a78b86fc1742572e606bbbf009e4a
2021-05-19 22:52:54 +00:00
Neil Fuller
03632f3418 Merge "Provide a new command line for host tests" into sc-dev am: 629d1f3ec2 am: fd08e82abb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550422

Change-Id: Icb4b902986aff5a68255119fee1aab7eeb666478
2021-05-19 22:52:42 +00:00
Yandry Perez Clemente
1530150778 Merge "Add a unique id to Perfetto trace and ANR dropbox header." into sc-dev am: c1b0d9ac23 am: 72eefed0f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344157

Change-Id: Ib8014149be29046767020dede79a9a01d98fce23
2021-05-19 22:52:31 +00:00
Bill Yi
fde662d51e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 740e4584fd -s ours am: 58ab9078f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice2ca16d38a349fe98f8f1a43e7c76760d6cc215
2021-05-19 22:52:20 +00:00
Fabian Kozynski
7cc03bd202 Merge "Change the strings for work tile." into sc-dev am: 90208a9ac1 am: c49fd1d3a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14551913

Change-Id: I74996a730a935ad992d50d7f789e3015066958ca
2021-05-19 22:52:09 +00:00
Beth Thibodeau
39f0288bad Merge "Fix page indicator tint" into sc-dev am: 5184c1f6e5 am: 3f172db674
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543621

Change-Id: I334bb71fa01d2c69a348a15afcbaa9f31532794b
2021-05-19 22:51:54 +00:00
Stanley Wang
e55e327827 Merge "Make LottieView rounded corners." into sc-dev am: d40d1b76af am: ef76ace143
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14548482

Change-Id: Ice3ccd9f04dd23643a1f339b8c56902015c6fe6c
2021-05-19 22:51:41 +00:00
Aaron Huang
481d5247d4 Merge "Split out NetworkStack and Tethering permission" into sc-dev am: 63fd72154c am: 2c90e7946e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14352466

Change-Id: I52a7dd289f86ff805062f30e93b93de2ccf3ea1c
2021-05-19 22:51:28 +00:00
Aaron Huang
b4c70e6032 Merge "Add ConnectivityAnnotations class" into sc-dev am: d2d8fa6c17 am: 329aede902
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186142

Change-Id: I45df58f58e096f27fa6bb2e1b359c514e68206fe
2021-05-19 22:51:15 +00:00
Stanley Wang
3aa1c7608a Merge "Update the margins and colors of MainSwitchBar to fit the spec." into sc-dev am: bd5c79d216 am: c0012c72e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14515951

Change-Id: I4f814a64aa4600aa091e8b40f546aec97843b6bc
2021-05-19 22:51:03 +00:00
Riddle Hsu
7b89a8fa72 Merge "Use matrix to scale icon for splash starting window" into sc-dev am: 65782cf2c1 am: e13ff2fc3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540930

Change-Id: Ife152722083ec6ce41aa9a827b01705d75b9d17c
2021-05-19 22:50:51 +00:00
Nikita Iashchenko
075055c8cd Merge "Refactor StructCapUser{Header,Data} and StructLinger for API review" am: c1edd696c7 am: e995e4b476 am: 588d53d538
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689828

Change-Id: I72f11a134227952b636fb2db8f519d5d271ad9a8
2021-05-19 22:50:36 +00:00
Shawn Lin
637251ac0a Merge "Attach nav bar to app during transition for non-remote animation case" into sc-dev am: 532dd4e6f7 am: e7043ada7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14326767

Change-Id: I9faa5400b8af89d744079f670845edb41bc14e06
2021-05-19 22:50:16 +00:00
Siim Sammul
65883d910a [automerger skipped] Merge "Change BinderLatencyBuckets to use int[] instead of ArrayList to improve performance." am: 0dadb6664a am: df590e2e6b -s ours am: 719e0ec753 -s ours
am skip reason: Merged-In Id996b52b5cb69a85f9c6a932ea8d30336fcaf12a with SHA-1 1aa3fb5e4c is already in history

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

Change-Id: I360f6897b0aeb95097515abc689648d187672470
2021-05-19 22:50:05 +00:00
Mariia Sandrikova
89a8a5a7ef Merge "Don't clear size compat mode on fold/unfold." into sc-dev am: 9b60ca5d02 am: e98407731d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14532742

Change-Id: Ib22dcdd0464b42410f9c24ba996c0bc4aa1e8ef7
2021-05-19 22:49:47 +00:00
Paul Hu
bf8ce712cf Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: a199e8bf27 am: eaaa0cbce1 am: c41b928f88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573

Change-Id: Ie76502bc49a20ceafc9ab9a6a448a0b1a178b37a
2021-05-19 22:49:34 +00:00
TreeHugger Robot
16ce9b9ae3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 46f3714cff -s ours am: e638648a34 -s ours am: dc1c17cef9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36ac50b1e78c1984ea2df0f577d49bc4043eb517
2021-05-19 22:49:19 +00:00
TreeHugger Robot
4bf0b701b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 820b1182a5 -s ours am: 08e0489ef5 -s ours am: 5e4c7a4bba -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib40c99f6133cc7a2edf76ccac0451a7a7242c5e5
2021-05-19 22:49:09 +00:00
TreeHugger Robot
184f0421d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7abf84148e -s ours am: 4a4fde8ee2 -s ours am: 87d2e16bc1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I82cda297ad306fa219740c99e8a0a38cd81ab27a
2021-05-19 22:49:00 +00:00
JW Wang
c4f23a7b41 [automerger skipped] Merge "Backport of ag/14170751 and ag/14170752." into rvc-qpr-dev am: 3208605ab6 -s ours am: e1645d0c0c -s ours am: d9952e3d4f -s ours
am skip reason: Merged-In I3c2b718905d2d7619d6f299ee5402fd858de030e with SHA-1 80005cd697 is already in history

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

Change-Id: Ie685caeb0635368d4c036661933233ab0173b67c
2021-05-19 22:48:50 +00:00
Paul Hu
16288d35f2 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: 59dc4f0ac2 am: 9eec752260 am: 02f0c190d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572

Change-Id: I6bfca3977345a57da6dc7938911fa3e26ea543e8
2021-05-19 22:48:36 +00:00
Bill Yi
05aed03251 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ec48469498 -s ours am: 82cf83d490 -s ours am: 519cf26bed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5502122811b6a29e7b610ce341d2d0354ea156aa
2021-05-19 22:48:20 +00:00
Bill Yi
3e7cc0bb1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f16879e389 -s ours am: c5693543ee -s ours am: 94f809e301 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52edecc9431b1a579412ce6048d1b5c584bcd5fc
2021-05-19 22:48:12 +00:00
TreeHugger Robot
ad1c4b66a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 04df2e101a -s ours am: c4a46588bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bec53573a62b8153204402e0e9ff395345859eb
2021-05-19 22:48:06 +00:00
Jeff Sharkey
40a2050e5c Merge "Guard against null BluetoothDevice extras." into sc-dev am: 53deb833da am: a19c83bd2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14556719

Change-Id: I8776d128f2417a62e1221726a3924ceae4cec233
2021-05-19 22:47:55 +00:00
Chiachang Wang
124b6d071d [automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: 86a1c27f57 am: 1fb7474033 -s ours am: e3491b3619 -s ours
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 2b14c9979d is already in history

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

Change-Id: I4af87b18428e5b063e06e3ae9e5ed70696159f0c
2021-05-19 22:47:41 +00:00
Jeff Sharkey
3e006db10d Merge changes from topic "may15" into sc-dev am: 63a1453832 am: b1b4de9ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14515460

Change-Id: I2d1036ca3b7876e5f07c267ae8b884368d60c599
2021-05-19 22:47:24 +00:00
Jeff Sharkey
e97c037d19 Apply AttributionSource during Intent delivery. am: dd6dd3b1fb am: 2d0e8e3d5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14470318

Change-Id: Iac0646b8065a4e70ec0366db19943db33ba2e40b
2021-05-19 22:47:13 +00:00
Junyu Lai
7f303717b8 Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: ed64c29783 am: 8354c4531a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859

Change-Id: I9ce9369b30bc568a63321de8764bd49c263b9ea6
2021-05-19 22:47:04 +00:00
Li Li
89cb82199e Merge "Freezer: fix delayed freezing operation" into sc-dev am: 6fb4729ecf am: e0e6d97272
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14553108

Change-Id: I0ab4a15f8b4fd585005626091d8743a5c40c0d66
2021-05-19 22:46:48 +00:00
Selim Cinek
2425cfcc47 Merge changes from topic "lockscreen_shade_transition" into sc-dev am: 7f1f8d0bcd am: 963ddeffa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14141538

Change-Id: Ieba0c000fac28ebb5533dbf3ab3c582f861cf5e6
2021-05-19 22:46:36 +00:00
Selim Cinek
39990f784d Convert DragDownHelper to Kotlin am: 91579bde59 am: bb6679264b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14141534

Change-Id: Iddeb0ec560f04d8be82bdab9aea5773dfe4b5cd3
2021-05-19 22:46:23 +00:00
TreeHugger Robot
360415317f Merge "Revert "Add a permission for CDM apps to start FGS from the background"" into sc-dev am: d3a796c657 am: 0751fcd324
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14555294

Change-Id: Iebaa3f484a9da1efbba37a731c6aa17680257d86
2021-05-19 22:46:13 +00:00
Winson Chung
3509706314 Merge "Only allow app drags to go to global intercept windows" into sc-dev am: 3bf189f78b am: 55e4e22390
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14527702

Change-Id: I3dcb06ee059ce0a4e784aab650fc602cc377994b
2021-05-19 22:45:57 +00:00
Winson Chung
49e3e5edd2 Merge "Add fallback animation for auto-enter without source rect hint" into sc-dev am: 79914dfbd5 am: 6d53421813
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14105379

Change-Id: I7cf936373d803cdb39d8448fef6025e1c69f70a5
2021-05-19 22:45:45 +00:00
TreeHugger Robot
b9230b4e33 Merge "Add perf test for SystemFonts.getAvailableFonts" into sc-dev am: c226a8408f am: a8d2496e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14553105

Change-Id: I96098470a4ab5bbdc07a7f4dc2ec418f2a7c0cb8
2021-05-19 22:45:30 +00:00
TreeHugger Robot
dee3647684 Merge "Let "ime enable/set" return exit code 255 when failed" into sc-dev am: 0cc80c7bcf am: 6af8e1281e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543491

Change-Id: Ic41da1bbe58dd2046ae9f1d930748459eb477e6f
2021-05-19 22:45:16 +00:00
Benedict Wong
5bf465eb34 Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-dev am: e0ee346120 am: b9b8c45d66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554154

Change-Id: I35b143ab3ccf4ce45e28bbd4bc064a5c43566ba3
2021-05-19 22:45:00 +00:00
Benedict Wong
1f06b95c62 Merge "Remove underlying network caps" am: 886e94b0a3 am: a6006f1d44 am: 6452f6f978
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709008

Change-Id: I53e774ed83fee2055814734ee4826b470e8b65e1
2021-05-19 22:44:47 +00:00
Nathan Harold
7a74a69551 Merge "Update VCN Owners Post-Initial-Development" am: 4b8d448b3b am: b9ec9c28ef am: e386a1fbe8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709010

Change-Id: I824eb0cee121e8be4bdbe9f0d3bcd351b314fd0b
2021-05-19 22:44:29 +00:00
Chris Li
ce01ed5972 Merge "Determine whether to support activities in multi window (8/n)" into sc-dev am: b4aec6206f am: 8ba4c5ce12
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14412466

Change-Id: Iad196e550bd77f931edc056ad90b2c4117dbde49
2021-05-19 22:44:09 +00:00
Jayachandran Chinnakkannu
22a6eb89f4 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91 am: 5abb533da2 am: faf4ba40ba am: 6b09036ab8 am: a258dcd355
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: Ia548f7e27aedcaaae684568fce8762813c4cfcc3
2021-05-19 22:43:39 +00:00
TreeHugger Robot
b4c971e613 Merge "Relaxing minimum alarm window requirements" into sc-dev am: 60b32709f0 am: 1de45a16c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14542468

Change-Id: If07fd853adfeb8fbc781035f4f4238f915687e33
2021-05-19 22:43:20 +00:00
Ahaan Ugale
727b2be99f Merge "Fix IndexOutOfBoundsException when calling dispatchProvideStructure()" into sc-dev am: 9e22972568 am: 108c167eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14442225

Change-Id: I4df03ac726d4de7b1f9b46a81e6a1e3ff0c4b6e2
2021-05-19 22:43:05 +00:00
Connor O'Brien
341c4bb304 Merge "Don't remove UID data in readKernelCpuUid*TimesLocked" into sc-dev am: 83a5e6ed18 am: 26886ae9d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489420

Change-Id: I18f9d03ee19ce38801fa3d39bdc24aaa1c210085
2021-05-19 22:35:33 +00:00
TreeHugger Robot
1c9d39d845 Merge "Clear updated font files in safe mode." into sc-dev am: 7c4e5a69b0 am: 34dfa9f75c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13743173

Change-Id: If6227881b7c6d660dcbd96569ece29f652cb7c3d
2021-05-19 22:35:19 +00:00
Jayachandran Chinnakkannu
fb8eb1fa28 Merge "QOS filter matching support based on remote address and port number for connected sockets" am: 853bb0df91 am: 5abb533da2 am: f08f579317
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813

Change-Id: I1e20ec6047dda2accc8565a8a2034bd535eb607c
2021-05-19 22:34:55 +00:00
Jeff Sharkey
59dee6d78b Merge "Add OWNERS to com.android.internal.app.procstats" am: a469054f27 am: d59dfa2fb1 am: cd6fbb1b4d am: 673a8c593c am: b1bff48064
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691206

Change-Id: I4588103cb1b20172199dca25390d558a6f3b41d4
2021-05-19 22:34:31 +00:00
Peter Kalauskas
d13bca91ba Merge "Add tests for shouldAnimate and onDoneButtonClicked" into sc-dev am: a74aa47b9e am: 017577dfe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14518676

Change-Id: I36e7f2e2fde434edb7e15efcc37a22438795e539
2021-05-19 22:34:07 +00:00