Eric Biggers
|
3abc52220b
|
Merge "Stop using FDE-related constants from IVold" am: 489ba5ac07 am: 84f05b1b9c am: e1a9ca0ec8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031025
Change-Id: Ic411eb688afe449212dee247d2ecb39471c4314f
|
2022-03-22 18:04:27 +00:00 |
|
Muralidhar Reddy Mule
|
7475dc64f2
|
[automerger skipped] Merge "[MEP] Add port index to icc logical channel open, close and trasmit APIs." am: 2f173adb93 am: 89a0114fdf am: ea905c5307 -s ours
am skip reason: Merged-In I98036645023bd7ba12475d4a06ce64287401471b with SHA-1 5d4bad448f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036703
Change-Id: I7deaebce99b742dfa21b8fe877e90a95c38e0dd7
|
2022-03-22 18:02:56 +00:00 |
|
Lais Andrade
|
5955825c5f
|
Merge "Add cancelation reason to vibration status" into tm-dev
|
2022-03-22 18:02:31 +00:00 |
|
Steve Elliott
|
0e77eac9e4
|
Merge "Guard against ContentResolver exceptions" into tm-dev
|
2022-03-22 17:55:46 +00:00 |
|
Allen Xu
|
e8af69f3dd
|
Merge "Support PersistableBundle type config values in getConfigByComponentForSubId" into tm-dev
|
2022-03-22 17:54:47 +00:00 |
|
Amith Yamasani
|
44236ccc9a
|
Merge "Fix typos in broadcast strings for RestrictionsManager" into tm-dev
|
2022-03-22 17:52:58 +00:00 |
|
Allen Hair
|
cfe8d5b246
|
Merge "Update asm-7.0 to asm-9.2." am: ad55d80482 am: 92864663c1 am: 100d91e9f3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016115
Change-Id: I556bf78799ec0fcd9d32eb16a2bd7a023ab5c7fd
|
2022-03-22 17:50:57 +00:00 |
|
Eric Biggers
|
e1a9ca0ec8
|
Merge "Stop using FDE-related constants from IVold" am: 489ba5ac07 am: 84f05b1b9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031025
Change-Id: Id7be68ef1c367fb461236a0c14b4dbb8e0ca5bdd
|
2022-03-22 17:47:04 +00:00 |
|
Muralidhar Reddy Mule
|
ea905c5307
|
Merge "[MEP] Add port index to icc logical channel open, close and trasmit APIs." am: 2f173adb93 am: 89a0114fdf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036703
Change-Id: I6cc8f6af157e565f733a11890d043a6c220d204a
|
2022-03-22 17:46:30 +00:00 |
|
Eric Biggers
|
84f05b1b9c
|
Merge "Stop using FDE-related constants from IVold" am: 489ba5ac07
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031025
Change-Id: Ie049bddf8ec1e384f73950df3f9907131aecc057
|
2022-03-22 17:46:15 +00:00 |
|
Muralidhar Reddy Mule
|
89a0114fdf
|
Merge "[MEP] Add port index to icc logical channel open, close and trasmit APIs." am: 2f173adb93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036703
Change-Id: I2898fa8427edb2553dcf1e86352b3f738ea8c01c
|
2022-03-22 17:44:59 +00:00 |
|
Allen Hair
|
100d91e9f3
|
Merge "Update asm-7.0 to asm-9.2." am: ad55d80482 am: 92864663c1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016115
Change-Id: I1b81166403e4b751f10e783208a3e6483d74b7e3
|
2022-03-22 17:43:34 +00:00 |
|
Eric Biggers
|
489ba5ac07
|
Merge "Stop using FDE-related constants from IVold"
|
2022-03-22 17:37:32 +00:00 |
|
Muralidhar Reddy Mule
|
2f173adb93
|
Merge "[MEP] Add port index to icc logical channel open, close and trasmit APIs."
|
2022-03-22 17:23:56 +00:00 |
|
Allen Hair
|
92864663c1
|
Merge "Update asm-7.0 to asm-9.2." am: ad55d80482
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2016115
Change-Id: Ice6bfd043680d984cad10134ff8faa2cd31f8a50
|
2022-03-22 17:20:25 +00:00 |
|
Fabian Kozynski
|
9640eb5e3b
|
Merge "Fix icon color animator" into tm-dev
|
2022-03-22 17:17:12 +00:00 |
|
Dave McCloskey
|
7fc2817ac1
|
Merge "Refactor TrustTests waiting into common function." into tm-dev
|
2022-03-22 17:11:13 +00:00 |
|
Ameer Armaly
|
f26d0418b0
|
Merge "TouchExplorer: do not crash when the user lifts a finger while dragging." into tm-dev
|
2022-03-22 17:06:19 +00:00 |
|
Shikha Malhotra
|
f51ddd719a
|
Merge "Sets the first boot in installd to create data directories with project id" am: 88e0d21b31 am: b26bce1d11 am: 404a542cde
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946688
Change-Id: Id4a66a29eb1c40ab88fbc1d31e82d9078186aeae
|
2022-03-22 17:05:46 +00:00 |
|
TreeHugger Robot
|
01899ba846
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours am: 11660ceb13 -s ours am: 8f153b6462 -s ours am: 795ffb4348 -s ours am: 13e942ca4b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I5aa75be8f25ee8d9a8cbb26295f9fe933789d7cf
|
2022-03-22 17:05:09 +00:00 |
|
Julia Reynolds
|
5b297e5b69
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours am: ed9f9457fc -s ours am: 2b0faceee8 -s ours am: f99cc488e0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I3b63380036a0db295fca11b388e630c5856cd07d
|
2022-03-22 17:04:57 +00:00 |
|
Shikha Malhotra
|
404a542cde
|
Merge "Sets the first boot in installd to create data directories with project id" am: 88e0d21b31 am: b26bce1d11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946688
Change-Id: I9f662a9fd7918f17a9bba5c29e7c64d0c2a336b1
|
2022-03-22 17:04:53 +00:00 |
|
TreeHugger Robot
|
1e332c5eab
|
[automerger skipped] Merge "MidiService: clear status when device unbound" into sc-v2-dev am: da2247faf8 am: c46b17eff0 -s ours
am skip reason: Merged-In I9fe45eeb2d51356d114ae5a1a175e3d1f6977328 with SHA-1 59a36aeb0d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17239105
Change-Id: I0832b90b1d76fbaa9c2e9d318f7f5d480b4db5e4
|
2022-03-22 17:04:05 +00:00 |
|
Allen Hair
|
ad55d80482
|
Merge "Update asm-7.0 to asm-9.2."
|
2022-03-22 17:03:20 +00:00 |
|
TreeHugger Robot
|
14daf27904
|
Merge "Fix TaskView over lockscreen" into tm-dev
|
2022-03-22 17:02:23 +00:00 |
|
TreeHugger Robot
|
90b2bfd4bc
|
Merge "Fix wrong Nullability of BoringLayout new API introduced in API33" into tm-dev
|
2022-03-22 17:00:27 +00:00 |
|
Shikha Malhotra
|
b26bce1d11
|
Merge "Sets the first boot in installd to create data directories with project id" am: 88e0d21b31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946688
Change-Id: Ib7392ca2c327cf4076c7cfd6b0af15c10cc162f5
|
2022-03-22 16:49:24 +00:00 |
|
TreeHugger Robot
|
13e942ca4b
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours am: 11660ceb13 -s ours am: 8f153b6462 -s ours am: 795ffb4348 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I8e9d31bf6a510e2fe3ea6fd89ef77861a0fb44a1
|
2022-03-22 16:42:15 +00:00 |
|
Julia Reynolds
|
f99cc488e0
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours am: ed9f9457fc -s ours am: 2b0faceee8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I2c20e67f448363286fc9d4f190d501a5e4db5068
|
2022-03-22 16:42:08 +00:00 |
|
TreeHugger Robot
|
c46b17eff0
|
Merge "MidiService: clear status when device unbound" into sc-v2-dev am: da2247faf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17239105
Change-Id: I8f6018f47d780d2d17e6833b69b82c9f53ee9f08
|
2022-03-22 16:41:33 +00:00 |
|
TreeHugger Robot
|
0cee085fbe
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours am: 11660ceb13 -s ours am: fcdd759ad3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I8fd98d8d68daebf280888a2f86a0e1a46ff0ef89
|
2022-03-22 16:34:36 +00:00 |
|
TreeHugger Robot
|
795ffb4348
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours am: 11660ceb13 -s ours am: 8f153b6462 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: Ic7aad0a60c722383f73579bd573bb24de83098d9
|
2022-03-22 16:34:18 +00:00 |
|
Julia Reynolds
|
2b0faceee8
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours am: ed9f9457fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I91ff01a56bd3c2297b75fa29061ce83520266c16
|
2022-03-22 16:34:17 +00:00 |
|
Julia Reynolds
|
17bedf903a
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours am: 6c7729f469 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: Ie0d974b8ce6ba408c5fd72f5167da16c206f1045
|
2022-03-22 16:34:13 +00:00 |
|
Shikha Malhotra
|
88e0d21b31
|
Merge "Sets the first boot in installd to create data directories with project id"
|
2022-03-22 16:32:40 +00:00 |
|
TreeHugger Robot
|
da2247faf8
|
Merge "MidiService: clear status when device unbound" into sc-v2-dev
|
2022-03-22 16:27:03 +00:00 |
|
TreeHugger Robot
|
8f153b6462
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours am: 11660ceb13 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I80618869b9f8e566f23a438ba5f9b42655e57598
|
2022-03-22 16:19:43 +00:00 |
|
Julia Reynolds
|
ed9f9457fc
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: Ie226108cb703e4a5b5c934731e217cc6dc349070
|
2022-03-22 16:19:39 +00:00 |
|
TreeHugger Robot
|
fcdd759ad3
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours am: 11660ceb13 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I13479414774638365ba0c3b8366b540566b82277
|
2022-03-22 16:18:57 +00:00 |
|
Julia Reynolds
|
6c7729f469
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours am: 65ed884b58 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I399820e14907ecd9daafbedca7ba0dbdfdf0cc52
|
2022-03-22 16:18:51 +00:00 |
|
TreeHugger Robot
|
11660ceb13
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours am: f308e83a47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I3bfe3641f62f10a59d30ed36fbdf6d9e791061bf
|
2022-03-22 16:05:36 +00:00 |
|
David Christie
|
74807869b8
|
[automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 6dac41f676 am: 1c3fa305ac -s ours am: 2474b2a38e -s ours am: 3b47535d8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183362
Change-Id: I34b19cc80d4b311511102e9674f889637727dfda
|
2022-03-22 16:05:34 +00:00 |
|
Julia Reynolds
|
65ed884b58
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours am: 97801c8872 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I9ed16bbd356bd4ba61c9a3cb9941a6a454453270
|
2022-03-22 16:05:21 +00:00 |
|
David Christie
|
a039744900
|
[automerger skipped] DO NOT MERGE am: 7f8c5e6371 am: 31e57724b1 -s ours am: fd96788fe0 -s ours am: b7029a8d69 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17183362
Change-Id: I2be4c8b3bceaf749b4d1ead1f95e5d11248a9827
|
2022-03-22 16:05:18 +00:00 |
|
Gaurav Bhola
|
401af7cf1f
|
Merge "Fix the ordering of taskevents." into tm-dev
|
2022-03-22 16:04:16 +00:00 |
|
Songchun Fan
|
043ff055e0
|
Merge "[SettingsProvider] fix timestamp format in dump" into tm-dev
|
2022-03-22 15:58:05 +00:00 |
|
Sergey Serokurov
|
493666178c
|
Merge "Set Manage button click listener using postDelayed" into tm-dev
|
2022-03-22 15:55:50 +00:00 |
|
Nikita Ioffe
|
2da047710d
|
Merge "Remove TRACE_TAG_APEX_MANAGER" into tm-dev
|
2022-03-22 15:53:59 +00:00 |
|
TreeHugger Robot
|
f308e83a47
|
[automerger skipped] Merge "DO NOT MERGE Add an OEM configurable limit for zen rules" into rvc-dev am: ece6094d9a -s ours
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 b21e9e17f6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I45260bd65864473a57f98ed313eacc7c126bd492
|
2022-03-22 15:50:57 +00:00 |
|
Julia Reynolds
|
97801c8872
|
[automerger skipped] DO NOT MERGE Add an OEM configurable limit for zen rules am: 1db5d40205 -s ours
am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 b21e9e17f6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046136
Change-Id: I1adb5c318b915dc4c1a94eb3214d98983139cb33
|
2022-03-22 15:50:49 +00:00 |
|