Commit Graph

734862 Commits

Author SHA1 Message Date
TreeHugger Robot
53edfd6f3e [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours am: 02f4d5a8e4 -s ours am: caa7214ae1 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I4a077b59d55d023e1af326af1444416449f2b64a
2021-12-07 20:35:34 +00:00
TreeHugger Robot
02f499374d [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b am: 1c376943ee -s ours am: e1fa554693 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I56f300176d06dc81ed5cb08f50208b7ac1d6827e
2021-12-07 20:35:15 +00:00
TreeHugger Robot
bc295c7c81 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours am: 31801ae6ea -s ours am: ec7d1fe059 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: Ic11631847f88f7be8a95485109e5e2a54328c07a
2021-12-07 20:34:47 +00:00
Ruslan Tkhakokhov
92910d8bdb Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev am: fb7c9dfb81 am: 87921ea2d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16343958

Change-Id: I6b74a1ff041cb3e06173bb86927997238d19a06e
2021-12-07 20:34:22 +00:00
TreeHugger Robot
ef253453f2 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b -s ours am: c7186b0847 -s ours am: 14e8d1ddfd -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 85b3e879f8 is already in history

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

Change-Id: I0b468d45494bf3fb3a95c6e69cf2ca1da36be9c1
2021-12-07 20:33:59 +00:00
TreeHugger Robot
0c65cf81af [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-v2-dev am: 067e59bbf6 am: 5b0a126114 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 a27822a795 is already in history

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

Change-Id: I60270ffba2aed855e9190cce8a546dfe001af9bc
2021-12-07 20:33:32 +00:00
Automerger Merge Worker
eac071dec3 Merge "Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363 am: 9399b9981d am: 643beefbb9" 2021-12-07 20:32:52 +00:00
TreeHugger Robot
5ca1b16bbc [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac am: 3d806ea42f -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 8002034e6b is already in history

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

Change-Id: I593fc5c93b0206bfe2db526b7e07317d1ab26d7f
2021-12-07 20:32:25 +00:00
Evgenii Stepanov
558071405e Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363 am: 9399b9981d am: 643beefbb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: Ib7a87adb6df9071e3a281a8b7377dd1b4695244c
2021-12-07 20:32:17 +00:00
TreeHugger Robot
caa7214ae1 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours am: 02f4d5a8e4 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I1dd8d568b5c13763e3b208df74d75e3c2afab459
2021-12-07 20:31:31 +00:00
TreeHugger Robot
e1fa554693 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b am: 1c376943ee -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I3f6fc0a6b5e0b32f5ae1470e2b02e436b5d02e32
2021-12-07 20:30:46 +00:00
TreeHugger Robot
ec7d1fe059 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours am: 31801ae6ea -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I2e2b9a1a887bc50f77a41369e8f64920105da2c4
2021-12-07 20:24:07 +00:00
TreeHugger Robot
31801ae6ea [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I345b29629a41f035421c996e7124a223790144c7
2021-12-07 20:15:52 +00:00
Ruslan Tkhakokhov
87921ea2d1 Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev am: fb7c9dfb81
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16343958

Change-Id: I33cc7660367057f5cea9fd74878152e1750acacb
2021-12-07 20:15:09 +00:00
Ruslan Tkhakokhov
fb7c9dfb81 Merge "Dispose of TransportClient in BMS#beginRestoreSession" into sc-v2-dev 2021-12-07 20:07:41 +00:00
TreeHugger Robot
02f4d5a8e4 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours am: e95d840923 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: Ia90b0eb8b2bab13b8b7d06492beb00673810ac95
2021-12-07 20:07:25 +00:00
TreeHugger Robot
1c376943ee Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371979

Change-Id: I04bc0f2026f7780fc27bd3e4c9250edea898673f
2021-12-07 20:06:53 +00:00
TreeHugger Robot
14e8d1ddfd [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b -s ours am: c7186b0847 -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 85b3e879f8 is already in history

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

Change-Id: I670d7d76412574430f36c4ec43e772cdc9fdd0bf
2021-12-07 20:06:50 +00:00
TreeHugger Robot
e95d840923 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 abdf5a518d is already in history

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

Change-Id: I5643a77b535459c955e2a8d09736463473e0a04f
2021-12-07 20:06:34 +00:00
TreeHugger Robot
c7186b0847 [automerger skipped] Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev am: 81e1e9b53b -s ours
am skip reason: Merged-In I9f5d2851ff59da90163ead6c0416f0bba3868cc4 with SHA-1 85b3e879f8 is already in history

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

Change-Id: Ia64e2c7ff5669cbf6676affa7132f391143166fe
2021-12-07 20:06:33 +00:00
TreeHugger Robot
5b0a126114 Merge "Add missing size check when parsing staged aliases" into sc-v2-dev am: 067e59bbf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371987

Change-Id: I3b6895218f9b6b0d2a83a4bf94881cd1fb588758
2021-12-07 20:06:12 +00:00
TreeHugger Robot
3d806ea42f Merge "Add missing size check when parsing staged aliases" into sc-dev am: d8d54c9aac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16371343

Change-Id: Ied2d4feffb231e55a18633ea4011a79fe1f154cd
2021-12-07 20:05:03 +00:00
TreeHugger Robot
cf37df74d7 Merge "Promote/demote flicker tests" 2021-12-07 20:03:40 +00:00
Edgar Arriaga García
eafe89b200 Merge changes from topic "database-improvements"
* changes:
  Make slow queries logs show only when log tag enabled
  Remove old and unnecessary log
  Add some tests for database operations
  Add support for normal sync mode and propagate journalMode and syncMode on database open
  Add total execution time and statements executed to dumpsys dbinfo
2021-12-07 20:00:43 +00:00
Evgenii Stepanov
643beefbb9 Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363 am: 9399b9981d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: Ib57a9388139da44785a73253ea8c8769961db629
2021-12-07 19:56:14 +00:00
TreeHugger Robot
81e1e9b53b Merge "Add missing size check when parsing staged aliases" into sc-qpr1-dev 2021-12-07 19:45:58 +00:00
TreeHugger Robot
d8d54c9aac Merge "Add missing size check when parsing staged aliases" into sc-dev 2021-12-07 19:45:56 +00:00
TreeHugger Robot
067e59bbf6 Merge "Add missing size check when parsing staged aliases" into sc-v2-dev 2021-12-07 19:45:44 +00:00
Evgenii Stepanov
9399b9981d Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761 am: 7842e7f363
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: Iaecf2f0ab6145dda58af10bc17f5b171b169e802
2021-12-07 19:42:08 +00:00
Yan Yan
fcb499b805 Merge "Calculate priority based on caller configurations" am: 36a25527b4 am: 1f79b0cb09 am: 6d347ca8f6 am: 7428a74af7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906130

Change-Id: I5883e12a215a647b20c0199a5463d79b64617242
2021-12-07 19:26:54 +00:00
Evgenii Stepanov
7842e7f363 Merge "Pass MTE RuntimeFlags to AppZygote." am: 1db942e761
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1910277

Change-Id: If16ed953afd35c4c58ee7ea966b889a1a3ca62fb
2021-12-07 19:19:15 +00:00
Meng Wang
3eb2a5d7d8 Merge "Update javadocs based on API council feedback." 2021-12-07 19:17:21 +00:00
Yan Yan
7428a74af7 Merge "Calculate priority based on caller configurations" am: 36a25527b4 am: 1f79b0cb09 am: 6d347ca8f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906130

Change-Id: Ia515bc2a55313decbaa566170743d8e210debe1a
2021-12-07 19:08:10 +00:00
Xinyi Zhou
ba4c0a6476 Merge "Add Neary feature to PackageManager" 2021-12-07 19:07:47 +00:00
Evgenii Stepanov
1db942e761 Merge "Pass MTE RuntimeFlags to AppZygote." 2021-12-07 19:03:17 +00:00
Yi-an Chen
71cb9ec579 Merge "Support toggling 7d/24h priv dash usages" 2021-12-07 18:59:03 +00:00
Yan Yan
6d347ca8f6 Merge "Calculate priority based on caller configurations" am: 36a25527b4 am: 1f79b0cb09
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906130

Change-Id: I31b1e5c63735ad7e29aad0491920b75f8a3cab0e
2021-12-07 18:52:22 +00:00
TreeHugger Robot
6b353bdd67 Merge "Do not animate some split screen sides on fold animation" 2021-12-07 18:46:37 +00:00
Yan Yan
1f79b0cb09 Merge "Calculate priority based on caller configurations" am: 36a25527b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1906130

Change-Id: I3817a344247104eb4056e949d09a123662fb6b65
2021-12-07 18:29:48 +00:00
Kaiqiang Wang
6f0493a366 Merge "Add APIs to add and to remove listeners for AudioDescriptionStateChange." 2021-12-07 18:19:41 +00:00
Yan Yan
36a25527b4 Merge "Calculate priority based on caller configurations" 2021-12-07 18:10:47 +00:00
Marcus Hagerott
93cbb9ada4 Merge "Revert "Return null for contacts local account"" 2021-12-07 18:07:58 +00:00
Lucas Dupin
c0427c3c22 Merge "[Output Switcher] Add support for split mode" into sc-v2-dev am: f12551c388 am: 27d6cb5268
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16361304

Change-Id: I9bf884475543c21390e6d5d643185bc0eca97222
2021-12-07 18:03:56 +00:00
TreeHugger Robot
4fd2d762c3 Merge "Hide notification footer when QS is expanded." 2021-12-07 18:00:11 +00:00
Lucas Dupin
27d6cb5268 Merge "[Output Switcher] Add support for split mode" into sc-v2-dev am: f12551c388
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16361304

Change-Id: Icd13d26d5c592cfb9cf6d05decd5a3a0dc0cf1a6
2021-12-07 17:57:09 +00:00
Hongwei Wang
41ad2c15d3 Merge "Ensure at most one pip-dismiss-overlay" into sc-v2-dev am: de8bc925fd am: 9348526c18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373135

Change-Id: Id158c5695d036356191c7654daeeaad08d7ed123
2021-12-07 17:56:17 +00:00
TreeHugger Robot
d00bbd1e6d Merge "Add equals() for Resources.Theme" 2021-12-07 17:48:05 +00:00
Lucas Dupin
f12551c388 Merge "[Output Switcher] Add support for split mode" into sc-v2-dev 2021-12-07 17:44:24 +00:00
Hongwei Wang
9348526c18 Merge "Ensure at most one pip-dismiss-overlay" into sc-v2-dev am: de8bc925fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16373135

Change-Id: I5128ed0c8f224e4b14116aa083db4d5c4f49514c
2021-12-07 17:38:34 +00:00
Hongwei Wang
de8bc925fd Merge "Ensure at most one pip-dismiss-overlay" into sc-v2-dev 2021-12-07 17:18:24 +00:00