Commit Graph

667856 Commits

Author SHA1 Message Date
Kweku Adams
9634ee3a00 Merge "Make sure EJ rewarding quota works." into sc-dev am: 01af9eec33 am: e398f6c001
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13679727

Change-Id: I568f05ed0c365ea8c6763c6427e4b9917d21f5c0
2021-06-03 16:01:33 +00:00
Bob Badour
a2f0c2dad0 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: 745e7ee830 am: daf1e19524
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13670655

Change-Id: I7f941af3adc67cfd6cbace68d7b6b9c92fea5777
2021-06-03 16:01:04 +00:00
Peter Kalauskas
4e5e8cc769 Merge changes I3f3f10e8,I527e401b into sc-dev am: 9bcd1aef22 am: 92432693a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13608825

Change-Id: I7374698ee6b114782d515f8476af0b1b943c0fe9
2021-06-03 16:00:36 +00:00
Lyn Han
427780b356 Merge "Reorder bubbles without animations on collapse" into sc-dev am: 26e6b76d99 am: c72b3e8489
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13665681

Change-Id: I7122f7d6767f10185b3ad191d73b1808f6572490
2021-06-03 16:00:07 +00:00
Tom Taylor
abfd8bc220 [automerger skipped] Merge "Add messageId to both of the MMS methods" into sc-dev am: 1f21265785 am: 6ec13b064b -s ours
am skip reason: Merged-In Ic8e59b652967ab1296a92a1d5727dc226cb190fb with SHA-1 e8198d1dc0 is already in history

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

Change-Id: Ie83eee6f409518bbce5b046fcb9a091f2e811abd
2021-06-03 15:59:42 +00:00
Dan Saadati
c753bcc683 Merge "Update AppSearchManager class header with description and examples" into sc-dev am: 11924878af am: 9cf8f8adc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13619085

Change-Id: Icd70e32d2b88c6e10ea77499a3d49721ccb47a5c
2021-06-03 15:59:12 +00:00
Sarah Chin
615dce2afd Merge "APIs for 5G slicing" into sc-dev am: 02be60c442 am: 5a5fb6a4f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13483692

Change-Id: I1298267d9763dda6938406063bf89a772b2ef720
2021-06-03 15:58:43 +00:00
Jorim Jaggi
8e766b0c98 Merge "Revert to previous metric for jank reporting" into sc-dev am: 36540883a2 am: b322d8d363
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13687787

Change-Id: I0cd66abdaa87af6fd51cf7772eb3c364b8c6827a
2021-06-03 15:58:10 +00:00
Daniel Sandler
ccf09476d7 Merge "Verbose touch debugging for the status bar." into sc-dev am: fadb4547b6 am: 2734c3df4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13683951

Change-Id: I407fb48d563377fba677db4aaaf5b1415a64b230
2021-06-03 15:57:45 +00:00
Artur Satayev
b4974a8a4e Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev am: 6577a29794 am: 8ae6d00797
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676889

Change-Id: I9070496406599ed5efeba570287b05638d992dc1
2021-06-03 15:57:20 +00:00
TreeHugger Robot
6a2ae375d5 Merge "Add edge effect type accessors for views that support it" into sc-dev am: e4c9e20df0 am: b248515e03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13664170

Change-Id: I449175d3d47742222beb2890264049e75d0a1f79
2021-06-03 15:56:52 +00:00
Brian Stack
e154b6565d Merge "Remove unnecessary UWB functions" into sc-dev am: baba083691 am: 22258c9b5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13666616

Change-Id: I5a83a3435f2658edfecd44a4a7762f8667521ef7
2021-06-03 15:56:25 +00:00
Kweku Adams
41ff9d130a Merge "Revert "Dump most recently completed jobs."" into sc-dev am: 2d3ea22596 am: 6af27236c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13678904

Change-Id: Ie1e50996518d742884ce703c440ea4b1b57c0f3f
2021-06-03 15:55:54 +00:00
Santos Cordon
a0519a9ffc Merge "Send display-OFF event if that is initial state." into sc-dev am: 7fe46bae14 am: af171dd74c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13583070

Change-Id: I9cb81b8f93d9c44253cc8c91fd2b2ea00356a478
2021-06-03 15:55:28 +00:00
Pavel Grafov
197660cef8 Merge "Keystore 2.0: Remove attestKey from KeyChain." into sc-dev am: d00355cd6a am: 3c4d1f8234
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657290

Change-Id: Ibec5354955d66e3402a8d46a9aa636a28b08ad0c
2021-06-03 15:54:59 +00:00
Jamie Garside
cb964a96c3 Merge "Revert "Update the bouncer to be able to move to either side of a wide screen."" into sc-dev am: 5f630223cc am: 155a5da570
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676711

Change-Id: I6a2235b89ef23ec1358dc3b36403c580ce48ea17
2021-06-03 15:54:30 +00:00
Anton Hansson
9dc7132a40 Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev am: eaeaf0acac am: 0b7742adc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676776

Change-Id: I85d575cd07a8ef6d27a930ee05e2004b672001db
2021-06-03 15:54:04 +00:00
Josh Hou
8a7de118d8 [automerger skipped] Merge "Replace Handler with Executor" into sc-dev am: 53863bbcbf am: 44a18e0c24 -s ours
am skip reason: Merged-In Ie8291df9b10960f78bdfdd5986767e896a953abf with SHA-1 49bd548e23 is already in history

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

Change-Id: I3edc21f291c1997e4f782ca6b1c676cc5292fadc
2021-06-03 15:53:35 +00:00
Kholoud Mohamed
1949ebb4fa Merge "Expose setBindAppWidgetPermission as a testAPI" into sc-dev am: c3406718ef am: de5288d3ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13567146

Change-Id: Icdf56b4d03a9ecf8c051211751743bff834f2405
2021-06-03 15:53:06 +00:00
Orion Hodson
7dbb76a016 Merge "Fix warning about recursive loading of libmedia_jni.so" into sc-dev am: a6d52d2e9a am: 7a039026f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13640158

Change-Id: I552856fb5ee6dfde660b2a63ec2de293250c5d8d
2021-06-03 15:52:39 +00:00
Junyu Lai
e54735514e Merge "Revert "Add API to let apps color CallStyle notifications themse..."" into sc-dev am: 1d57fc25ae am: 63d3153c23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13676333

Change-Id: Ice5fb1017b8a3578fa92a56a0ebe1b0960d77a41
2021-06-03 15:52:11 +00:00
Robert Shih
0d3fc10833 Merge "MediaCryptoException: human readable error codes" into sc-dev am: f5e313dc1f am: e7ff0d76ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13639134

Change-Id: I6f192aa803deff0a29dc86100e7825709c18ed48
2021-06-03 15:51:44 +00:00
Stanley Wang
19b030509b Merge "Update MainSwitch widget." into sc-dev am: 359919c32d am: 026939d12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473185

Change-Id: I10839c666439d83e92ac94417e714ca25933c084
2021-06-03 15:51:19 +00:00
tim peng
f0b9a74244 Merge "[a11y]Talkback shouldn’t say Double tap to activate on panel if there isn't any feature after double tap." into sc-dev am: 78220278b9 am: e9ae79edbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671407

Change-Id: I556a9cd20fcbe64fe9c14951b0785130a7c1db1b
2021-06-03 15:50:47 +00:00
TreeHugger Robot
22b8a64b36 [automerger skipped] Merge "[NetworkPreferencesApp] Step 8: BOOT_COMPLETE svc" into sc-dev am: bf8a91d2fe am: f8a55246e5 -s ours
am skip reason: Merged-In I1e29ca3b03e90086cbde4e266fff7e0e473de749 with SHA-1 cd9aaadf56 is already in history

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

Change-Id: Ic64201ee8080c6a6323cee109ba92e5ab380eb60
2021-06-03 15:50:17 +00:00
TreeHugger Robot
66703580a7 Merge "Rename to addProviderRequestListener (framework/base)" into sc-dev am: 39ceb7f367 am: deefab4a1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13666867

Change-Id: I5295f4dbb168da4050d525b36ffdf8b27398c4a8
2021-06-03 15:49:45 +00:00
Peiyong Lin
e9e8ac1a9c Merge "Add flag_navigation_bar_overlay" into sc-dev am: 3a8a105dc2 am: ff01996a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13668734

Change-Id: I131c0865b6c99222b5c83614072f3f22a7b9c062
2021-06-03 15:49:17 +00:00
Jeff DeCew
32cbd8d30b Merge "Minimized notification height = 56dp" into sc-dev am: 8e2599beaa am: d1db5f6b8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13678667

Change-Id: Ic53bc873adbfd4115b7a7c70785a4f51189db6ed
2021-06-03 15:48:48 +00:00
Jeff DeCew
fb30519948 Merge "Add API to let apps color CallStyle notifications themselves." into sc-dev am: 1423ab74d3 am: e84f164738
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13661867

Change-Id: I642004e4bf3e4a3ccad953e12a4c38a30a350aee
2021-06-03 15:48:13 +00:00
tim peng
4a5b7131d4 Merge "Refactor EXTRA_PACKAGE_NAME to a generic string" into sc-dev am: d38c0368af am: 50b92e5719
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13659028

Change-Id: Ib2ffd61dd9bf2f3d9e2161784e48a55f0ba7954b
2021-06-03 15:47:47 +00:00
tim peng
66f6e31a76 Merge "[Fix] Bluetooth device ordering" into sc-dev am: d4a92b6976 am: 6f1b7a14d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13639313

Change-Id: If50afb82a6535276df82fa3dca88215f12ef67f7
2021-06-03 15:47:20 +00:00
Kevin Chyn
9c73bdd936 Merge "Add re-enrollment notification for face AIDL" into sc-dev am: eef75a4842 am: 2d397c70fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13670657

Change-Id: Ic212c78893c1660e947c347bf2984785aca50e52
2021-06-03 15:46:53 +00:00
Wu Ahan
445b10b269 Merge "Send broadcast to notify the events of a CUJ session" into sc-dev am: f6ed5fc57c am: 3495f5793e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13417775

Change-Id: I4799bc52c6b013f7735640973178892875eddefb
2021-06-03 15:46:27 +00:00
Treehugger Robot
76ea957147 [automerger skipped] Merge "Defer UID data removal until after reading is finished" am: ce2d40870e am: 7fddb382f7 am: 155808b3e2 -s ours am: 052c8cae69 -s ours am: 0871ace764 -s ours
am skip reason: Merged-In I38e037b89e71b0cb1ba01374189ba8b7af01d632 with SHA-1 9451197708 is already in history

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

Change-Id: Ia181a6dd00b93c769d984781d806f28ff305ede9
2021-06-03 15:46:02 +00:00
Cody Kesting
b95b8232c6 Merge changes I34ef76ec,Icf686c3d am: 7f60b13ff5 am: 7d8db6692d am: 2beb965c06 am: f85baf2259 am: 4d10755a09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597313

Change-Id: I4fc86629c793ee79aea9f96e6fded7f647db3075
2021-06-03 15:45:24 +00:00
Roshan Pius
1403494f1d [automerger skipped] Merge "Add getTargetSdkVersion without AppInfo" am: f8ab9c895b am: 1d024a0e6a am: 7394e95f36 -s ours am: a9bc44cf1b -s ours am: 4d64b6803b -s ours
am skip reason: Merged-In Ibe1a3e977cd71b23e26395eb6cc73f61c1a85a0e with SHA-1 050de3f78b is already in history

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

Change-Id: Ic549c9b5bdb06092cbcb41ea0ca712394097f0b1
2021-06-03 15:44:51 +00:00
Marcus Hagerott
5a7afdee0c Merge "Add more detail to javadocs for SimPhonebookContract" am: 57a0af04c5 am: dc54e7afdf am: c0b2128dd2 am: a5aea04314 am: 4e00361b5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596935

Change-Id: I2a0df217ebfdb84ed773d00f4ee6f3105d1a686a
2021-06-03 15:44:07 +00:00
Andrei-Valentin Onea
bbfe3c410e [automerger skipped] Merge "Create non updatable system server stubs" am: 359eca32b3 am: a03cf88ecd am: 88e092a602 -s ours am: b7c2f8d754 -s ours am: 1a1323fee3 -s ours
am skip reason: Merged-In Iecb9d51472ae238bbeabe65e1cd782b7c8a4ce59 with SHA-1 43114704e6 is already in history

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

Change-Id: Id5e9c7e2298ad8ed2c8d237e7ddfdc07beb1b5b4
2021-06-03 15:43:37 +00:00
Paul Duffin
6ea4577b4d Merge "Add explicit dependency from android.test.base to hiddenapi annotations" am: d9373ecdaf am: 808984145e am: be50859a86 am: 506649d916 am: 78a85bc1d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587217

Change-Id: Id35007d2de7541df56f6913717f980ed3be41bd8
2021-06-03 15:43:03 +00:00
Chiachang Wang
00724b702f Merge "Remove UidRange.createForUser() with userId integers" am: 9c92c37f56 am: 5809c1f054 am: 58becf95ef am: 89d6183cdf am: f355577366
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596511

Change-Id: I4fd3723328f70010e52dd168b4b71d2aa6660df2
2021-06-03 15:42:32 +00:00
TreeHugger Robot
cdb0d536ec Merge "Teach IMMS#shouldShowImeSwitcherLocked() about shouldShowInInputMethodPicker attr" into sc-dev am: 8968116543 am: c5ff9da420 am: ed0cd4e7d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14811983

Change-Id: I990a80eefe91d1aaa4c7a89a18e21acec945793e
2021-06-03 15:41:40 +00:00
Ryan Mitchell
d2befedf9f Merge changes I6da18cdb,I9de6ba64,I1af88c6d,I154783ff into sc-dev am: dc628e77a1 am: 9246beb4bd am: fd8380f389
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14752601

Change-Id: I2a0ed41abe0c899184f1c34065a64d692b8eb584
2021-06-03 15:41:23 +00:00
Lucas Dupin
8f48b5f0c8 Merge "Do not re-inflate QS and SB when CONFIG_UI_MODE" into sc-dev am: a07ad9a5ea am: 49c69783b1 am: a3bbf57ac6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14806638

Change-Id: I0cf2d5d18158be1e75f27e491c21f6ae013ccbc7
2021-06-03 15:41:02 +00:00
Caitlin Cassidy
ffe182deef Merge "[Device Controls] In the device controls QS tile, have the subtitle show the preferred structure name." into sc-dev am: 2cca71c0bf am: 85019397d5 am: 3d539a878c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14801410

Change-Id: Iac59bce7a6afda941e87f0e7e11adc6dfa488247
2021-06-03 15:40:43 +00:00
Colin Cross
d063c08bc6 Merge "Set dist_group: "android" for frameworks/base java_sdk_libraries" into sc-dev am: d1251db40d am: 276b22db59 am: abe1a2ed46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14489963

Change-Id: I473ed489cae4ae00cb0267d03bad02fe91df95b9
2021-06-03 15:40:04 +00:00
More Kuo
5743bd8c35 Merge "Update BluetoothA2dp API" am: ae6583b34f am: e90bacbc0a am: 51beeda872 am: d3ad78bade am: f0b2016a17
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596413

Change-Id: I27518223e394932bda92d3845799f53893edd3b4
2021-06-03 15:35:21 +00:00
Kevin Han
95ff281800 Merge "Register AppHibernationManager in service registry" am: 44183743e0 am: 0de60cd4e8 am: 2c842f3aa7 am: c03ec964c5 am: d240ffe743
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766

Change-Id: Ie7eda6598225f1aaa976ccfc2b5e3c335b0da6d7
2021-06-03 15:34:51 +00:00
Paul Hu
5c9e58e5cf Merge "Use PermissionUtils" am: 584e907d7a am: 93798f22e8 am: 85468ed557 am: 575877afd9 am: ee4b390c96
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098

Change-Id: I304feb0f6713095a54f025b7dde607d23f1598dc
2021-06-03 15:34:16 +00:00
Evan Severson
ca0bab123c Merge "Remove permission correcting code" into sc-dev am: 0088eefaac am: 657c1197b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13678630

Change-Id: I8ce0e5992947427d3c0598b5ab91f2eb34f342bf
2021-06-03 15:33:43 +00:00
TreeHugger Robot
d985b0d621 Merge "CachedAppOptimizer: fix fd leak." into sc-dev am: 7b68417fe8 am: 8f621c079d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13665789

Change-Id: I505c345051e7e11be68f191120b8476a17220284
2021-06-03 15:33:10 +00:00