Commit graph

5828 commits

Author SHA1 Message Date
Jaegeuk Kim
08c3cbdf93 Merge "Support zoned device with dm-default-key" am: bb97be3d82 am: 43c03c3fe7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417

Change-Id: Ib67668826bf1f6c89cde82bde67bb1e103395e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 15:27:49 +00:00
Jaegeuk Kim
43c03c3fe7 Merge "Support zoned device with dm-default-key" am: bb97be3d82
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417

Change-Id: I6d01a22e9e2b4770be90797e4f94199058de2144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 15:09:58 +00:00
Jaegeuk Kim
bb97be3d82 Merge "Support zoned device with dm-default-key" 2022-06-09 14:53:25 +00:00
Jaegeuk Kim
f6151b434c Support zoned device with dm-default-key
Note that, encrypt_inplace cannot support zoned device, since it
doesn't support in-place updates. And, dm-default-key will have
a different key.

Bug: 172378121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I34cb1e747e0f3faa07c5a4bfeded11fb789a033c
2022-06-07 18:43:54 -07:00
Daeho Jeong
9d933644ed [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: fd8b71898f -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I8010534ec31668e74e9107a660f15b6ad9574a38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-22 03:02:43 +00:00
Corina Grigoras
c1a9f4c8dc [automerger skipped] Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: c06c93aa35 -s ours
am skip reason: Merged-In I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499 with SHA-1 11a666b092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: Ia28f8890035fe52b1852daf7b7352f2036a0608d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 18:51:21 +00:00
Daeho Jeong
8506f9e1c0 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef am: d5e2ea0859 -s ours am: 53eac5bdf6 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I9eba1e3c4b35dedcc1765cc8ec11faeb59062028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:29:11 +00:00
Daeho Jeong
401bed9323 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef -s ours am: 0376d77c2a -s ours am: f29da943b1 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I2e44169a0c495ba4c4e12a08183d080341c83b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:27:03 +00:00
Daeho Jeong
8ba04134df [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 -s ours am: 019a2d5777 -s ours am: a3477972bf -s ours am: 464319bc49 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I35f4f35026f6510a4cbc3410a00e0bc145e7cdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:24:07 +00:00
Daeho Jeong
043264d5e8 [automerger skipped] vold: fix the range of stopped state of idleMaint am: 7667d64ab8 -s ours am: 9c232cc152 -s ours am: ece00ca639 -s ours am: f42e0f46ee -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I9242744b8109fc53721d62ae6377dc8f20d74acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:24:06 +00:00
Daeho Jeong
53eac5bdf6 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef am: d5e2ea0859 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I7d3fcad83f6dab0aca48719495e5e803fc3faa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:02:35 +00:00
Daeho Jeong
f29da943b1 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef -s ours am: 0376d77c2a -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I51ed1e4072edb43bb6006e1463267c203d5e419e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:54:34 +00:00
Daeho Jeong
464319bc49 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 -s ours am: 019a2d5777 -s ours am: a3477972bf -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I1cb303c99d4e950dbf75128087f4e9587b8368ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:53:07 +00:00
Daeho Jeong
f42e0f46ee [automerger skipped] vold: fix the range of stopped state of idleMaint am: 7667d64ab8 -s ours am: 9c232cc152 -s ours am: ece00ca639 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I7cca279d71b03a2aa163312ed2715e1052afff71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:53:06 +00:00
Daeho Jeong
d5e2ea0859 Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I7a617370df2ccdb0370be6ef0c6ad3f1938e2421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:46:25 +00:00
Daeho Jeong
0376d77c2a [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I4c1baba519710d2213824ef03744a1564835707b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:45:38 +00:00
Daeho Jeong
a3477972bf [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 -s ours am: 019a2d5777 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: Idf68b22427f79c02d2fe6d1618ae4141e428aa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:36:28 +00:00
Daeho Jeong
ece00ca639 [automerger skipped] vold: fix the range of stopped state of idleMaint am: 7667d64ab8 -s ours am: 9c232cc152 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: Ib4dc0e61d473f35ef1a339b92c2903e311ba5680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:36:27 +00:00
Daeho Jeong
cf75222aef Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: Ib1e14c92c1fc2671d182a34a0806dc1bdb480dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:27:42 +00:00
Daeho Jeong
fd8b71898f Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I4b6d22377242b54322889dde90b2f6c5c9d8fd55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:22:23 +00:00
Daeho Jeong
019a2d5777 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I427409239d386c4fba44ec7bcd87989e51e529a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:17:58 +00:00
Daeho Jeong
9c232cc152 [automerger skipped] vold: fix the range of stopped state of idleMaint am: 7667d64ab8 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 372b3510b5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18473902

Change-Id: I2e2a4afa9fd769dffc6c39d0c69a13418d03ca6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 22:17:56 +00:00
Daeho Jeong
baee102002 Merge "vold: fix the range of stopped state of idleMaint" into tm-dev 2022-05-20 21:15:13 +00:00
Zimuzo Ezeozue
13f54f722c Merge "Abort FUSE as part of volume reset" am: 3712b8de01 am: 73383ddb7f am: 2b5038faa5 am: 341016f6ac am: a45a8426ae
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101651

Change-Id: I0f48b8ca151fb2255514198848d19929c796e669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 14:56:51 +00:00
Corina Grigoras
37472b0191 [automerger skipped] Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 97c642cc99 -s ours am: 31337d3da3 -s ours am: 7b9e9b9e25 -s ours
am skip reason: Merged-In I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499 with SHA-1 11a666b092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I3e109c12d86fb9c3f0b53c590453f0dc5a3a31ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 14:49:58 +00:00
Corina Grigoras
53f3cf4800 [automerger skipped] Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 31667410da am: def08b57d6 -s ours am: 16fa729a1d -s ours
am skip reason: Merged-In I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499 with SHA-1 11a666b092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I6424268f6a8bfe95a9c2d3668cca69448ebfdcda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 14:31:41 +00:00
Corina Grigoras
e7981611ba Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 31667410da am: 6d5d430593 am: 7d5fabdbae
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I851b5efd42e89525ce14613a0df001ea38212677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 14:20:08 +00:00
Zimuzo Ezeozue
a45a8426ae Merge "Abort FUSE as part of volume reset" am: 3712b8de01 am: 73383ddb7f am: 2b5038faa5 am: 341016f6ac
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101651

Change-Id: I7ca6786c209dd01c37aa65e21dd7582a4df66eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:37:46 +00:00
Corina Grigoras
7b9e9b9e25 [automerger skipped] Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 97c642cc99 -s ours am: 31337d3da3 -s ours
am skip reason: Merged-In I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499 with SHA-1 11a666b092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: Ie7b700f59cb55fd5fc0f931a94f6afb9065af72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:37:13 +00:00
Corina Grigoras
16fa729a1d [automerger skipped] Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 31667410da am: def08b57d6 -s ours
am skip reason: Merged-In I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499 with SHA-1 11a666b092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I32425235ed3ed50b4b1d7ff65a5bfe597e5d53b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:34:05 +00:00
Corina Grigoras
7d5fabdbae Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 31667410da am: 6d5d430593
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I65dc81b9c120938e571f9a98998dc64c623f23dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:33:06 +00:00
Corina Grigoras
6d5d430593 Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 31667410da
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: Iff61fa271395b36e4fc8aaa55162429ea98f29e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:17:13 +00:00
Zimuzo Ezeozue
341016f6ac Merge "Abort FUSE as part of volume reset" am: 3712b8de01 am: 73383ddb7f am: 2b5038faa5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101651

Change-Id: I4220a1a657c3830165927dc55d47911566e04c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:16:49 +00:00
Corina Grigoras
31337d3da3 [automerger skipped] Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 97c642cc99 -s ours
am skip reason: Merged-In I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499 with SHA-1 11a666b092 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I92d7a4bc2640f9f2f10ec4e3479d5e35d7ef5bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:16:18 +00:00
Zimuzo Ezeozue
2b5038faa5 Merge "Abort FUSE as part of volume reset" am: 3712b8de01 am: 73383ddb7f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101651

Change-Id: I96d9d16e7989a547b3c0bfa97317f3e6e136bfab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:15:55 +00:00
Corina Grigoras
def08b57d6 Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39 am: 31667410da
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: I8ab722e85f8e198caebe8f7b22ffe6986a93237d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:15:43 +00:00
Corina Grigoras
c06c93aa35 Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: Ic5140ae4b9d4a54a85403ebbcf812086910a7bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:46:36 +00:00
Corina Grigoras
31667410da Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: Iea2d826dc84d499473d36c9634514e532c2a9d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:45:48 +00:00
Zimuzo Ezeozue
73383ddb7f Merge "Abort FUSE as part of volume reset" am: 3712b8de01
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101651

Change-Id: I7e4e62ee8b89168c03ab86071a8e7e109958906b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:45:14 +00:00
Corina Grigoras
97c642cc99 Merge "Abort FUSE as part of volume reset" into tm-dev am: 05098fee39
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18492349

Change-Id: Ie48a761a1b173f66e3cddbae6f965148c7a18645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:43:50 +00:00
Corina Grigoras
05098fee39 Merge "Abort FUSE as part of volume reset" into tm-dev 2022-05-20 09:59:53 +00:00
Zimuzo Ezeozue
3712b8de01 Merge "Abort FUSE as part of volume reset" 2022-05-20 09:34:24 +00:00
Zim
817f224fb4 Abort FUSE as part of volume reset
This fixes a bug in Android T where MediaProvider leaked FUSE fds in
it's process preveventing it from dying after being killed. This
resulted in the MP in a zombie state.

Even though, this bug was more prevalent in Android T due to a change
in the Parcel lifecycle (see b/233216232), this bug could have always
occurred in theory.

This fix should be harmless since after volume reset, all FUSE volumes
should be unmounted and aborting the FUSE connections will either
no-op or actually prevent the FUSE daemon from getting wedged in a
zombie state.

Test: Manually trigger a FUSE fd leak in the MediaProvider, kill it
and verify that it is restarted without zombie.
Bug: 233216232
Bug: 231792374
Bug: 230445008
Change-Id: I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499
2022-05-20 09:33:12 +00:00
Eric Biggers
a405db560e Remove obsolete support for emulated FBE
Emulated FBE was a developer-mode feature intended to allow developers
to add Direct Boot support to apps before native FBE devices became
widely available.  Since all devices running the latest version of
Android now use native FBE (except for a couple edge cases not relevant
here, like in-development devices on which encryption hasn't been
enabled yet), and emulated FBE doesn't work on native FBE devices
anyway, there's no longer any need to carry the code for emulated FBE.

Bug: 232458753
Change-Id: Ia6824699b578aca3af340fe578e26d5a5dc82b16
2022-05-20 04:41:42 +00:00
Zim
11a666b092 Abort FUSE as part of volume reset
This fixes a bug in Android T where MediaProvider leaked FUSE fds in
it's process preveventing it from dying after being killed. This
resulted in the MP in a zombie state.

Even though, this bug was more prevalent in Android T due to a change
in the Parcel lifecycle (see b/233216232), this bug could have always
occurred in theory.

This fix should be harmless since after volume reset, all FUSE volumes
should be unmounted and aborting the FUSE connections will either
no-op or actually prevent the FUSE daemon from getting wedged in a
zombie state.

Test: Manually trigger a FUSE fd leak in the MediaProvider, kill it
and verify that it is restarted without zombie.
Bug: 233216232
Bug: 231792374

Change-Id: I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499
Merged-In: I9e559a48b9a72e6ecbc3a277a09ea5d34c9ec499
2022-05-19 17:17:10 +01:00
Daeho Jeong
851671f35c Merge "vold: fix the range of stopped state of idleMaint" am: 289bcb5305 am: d7237292e3 am: 684554549d am: b56efd29a7 am: f4d14515d5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2100921

Change-Id: Iad5adee3aff62797922be207318e8e91f4b304c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 08:24:27 +00:00
Daeho Jeong
f4d14515d5 Merge "vold: fix the range of stopped state of idleMaint" am: 289bcb5305 am: d7237292e3 am: 684554549d am: b56efd29a7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2100921

Change-Id: I7d1e0197bcc63c043e550fe187775b8f03ed664e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 07:54:58 +00:00
Daeho Jeong
b56efd29a7 Merge "vold: fix the range of stopped state of idleMaint" am: 289bcb5305 am: d7237292e3 am: 684554549d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2100921

Change-Id: If02e0b9392a5124653911e42e71eee2e5537818c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 02:21:01 +00:00
Daeho Jeong
684554549d Merge "vold: fix the range of stopped state of idleMaint" am: 289bcb5305 am: d7237292e3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2100921

Change-Id: I1e70ad65c055db304ccbd9f64c739e3c8830175f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 01:35:59 +00:00
Daeho Jeong
d7237292e3 Merge "vold: fix the range of stopped state of idleMaint" am: 289bcb5305
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2100921

Change-Id: I3fc7979d0d5bd5da8fe49ffd1da3589a7df2db5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 00:53:22 +00:00