Eric Biggers
fb8e45d1bf
Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f
am: e51736136a
am: 9d2e149521
am: ba25d3a31b
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492
Change-Id: I01ce0fc7845aaf293535b2a12b71cd383b23c74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:52:04 +00:00
Eric Biggers
ba25d3a31b
Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f
am: e51736136a
am: 9d2e149521
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492
Change-Id: I29768034feababeb54ec8aa9357f31a6701b74a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:34:31 +00:00
Eric Biggers
9d2e149521
Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f
am: e51736136a
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492
Change-Id: Ic0ef4032bd5596c53f3c7c148928208f62b29300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:07:49 +00:00
Eric Biggers
e51736136a
Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492
Change-Id: I9d329a1da16d949f0f73d69dd943547a3f849fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:47:33 +00:00
Eric Biggers
d99898496f
Merge "Rename fscrypt_is_native() to IsFbeEnabled()"
2022-06-22 18:24:38 +00:00
Automerger Merge Worker
b6622cefc8
Merge "Use sysfs control for storage device GC am: d96b2ac076
am: 7f6de29a04" into tm-d1-dev-plus-aosp am: 0b378ca4dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: Ifc8ca694e581a68f2703211ccf8ce17286b3b70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:16:28 +00:00
Daeho Jeong
182a3efc8a
Use sysfs control for storage device GC am: d96b2ac076
am: 1403a82079
am: e5d7108512
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I9486f0118033b687f0649c0176edd4731d82faf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:16:19 +00:00
Daeho Jeong
88565ae67e
Use sysfs control for storage device GC am: d96b2ac076
am: 1403a82079
am: ff23bb4b4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I621dd57b6d57db9f62832dff8aa8576d12cc7b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:15:51 +00:00
Automerger Merge Worker
0b378ca4dc
Merge "Use sysfs control for storage device GC am: d96b2ac076
am: 7f6de29a04" into tm-d1-dev-plus-aosp
2022-06-21 21:51:47 +00:00
Daeho Jeong
77c2494428
Use sysfs control for storage device GC am: d96b2ac076
am: 7f6de29a04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I33616bdb3e41357f8337a8c95135fe1a373164d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:51:44 +00:00
Daeho Jeong
ff23bb4b4f
Use sysfs control for storage device GC am: d96b2ac076
am: 1403a82079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I2f7c0e3e2001d467b12ed2b11a0209a1ff3cc788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:51:43 +00:00
Daeho Jeong
e5d7108512
Use sysfs control for storage device GC am: d96b2ac076
am: 1403a82079
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I7a6483d63e3f4239582dbe1925b67d93814810dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:51:43 +00:00
Daeho Jeong
1403a82079
Use sysfs control for storage device GC am: d96b2ac076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I0e6b3725ebeb937a7046c492e4b699cfb2d24b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:34:16 +00:00
Daeho Jeong
7f6de29a04
Use sysfs control for storage device GC am: d96b2ac076
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074
Change-Id: I97bcf7e649090234866db71dd7454e2cd8af0b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:32:45 +00:00
Daeho Jeong
d96b2ac076
Use sysfs control for storage device GC
...
Sometimes, waiting for the HAL makes infinite calls to HAL and ending
up with power consuming issues. While tracking the root cause, we will
temporally turn off HAL for storage device GC.
Bug: 235470321
Test: run "sm idle-maint run"
Ignore-AOSP-First: This is a temporal fix for Android TM devices.
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be
2022-06-17 23:31:35 +00:00
Eric Biggers
a6957c0f7a
Rename fscrypt_is_native() to IsFbeEnabled()
...
Now that emulated FBE is no longer supported, there is no longer any
distinction between native FBE and emulated FBE. There is just FBE.
Referring to FBE as "fscrypt" is also poor practice, as fscrypt (the
Linux kernel support for filesystem-level encryption) is just one part
of FBE, the Android feature.
Therefore, rename fscrypt_is_native() to IsFbeEnabled().
Bug: 232458753
Change-Id: Idf4cb25d37bc3e81836fcc5a1d96f79ccfa443b7
2022-06-15 18:52:18 +00:00
Eric Biggers
1127e14727
Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e
am: 2e4373b415
am: a7c591bb75
am: f81cd24706
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774
Change-Id: Id7ad77d18e97929005b2bb85f47a0d6c3020334f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 20:03:37 +00:00
Eric Biggers
f81cd24706
Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e
am: 2e4373b415
am: a7c591bb75
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774
Change-Id: Ib5f6e6580a7f31db83b447e940ca8044d3c889fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 19:56:02 +00:00
Eric Biggers
a7c591bb75
Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e
am: 2e4373b415
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774
Change-Id: I9595487eb191397c30a795989b2f3ede636b4b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 19:52:48 +00:00
Eric Biggers
2e4373b415
Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774
Change-Id: Ia4a90c62bf8e974aa51c19791668b6706d84d087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 18:59:35 +00:00
Eric Biggers
7b04dba53e
Merge "Remove obsolete support for emulated FBE"
2022-06-09 18:42:00 +00:00
Jaegeuk Kim
1ae4f36006
Merge "Support zoned device with dm-default-key" am: bb97be3d82
am: 43c03c3fe7
am: 08c3cbdf93
am: 94f349081b
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417
Change-Id: Iee6681c8ad419d9ca6e45713eb170cf194499d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 16:18:15 +00:00
Jaegeuk Kim
94f349081b
Merge "Support zoned device with dm-default-key" am: bb97be3d82
am: 43c03c3fe7
am: 08c3cbdf93
...
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417
Change-Id: I046f27a9435b5c48bacb6438c02b3c59913d3301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 16:01:56 +00:00
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
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
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
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
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