Commit graph

5174 commits

Author SHA1 Message Date
Tianjie Xu
8081f39fce Merge "Delete the checkin directory with the wrong context" am: 2c48d37a29 am: 821e6c7db4 am: ea28c7cdce
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1866819

Change-Id: I8330072d26bff2f406100c66d46bede7fb436aba
2021-10-25 21:42:36 +00:00
Tianjie Xu
ea28c7cdce Merge "Delete the checkin directory with the wrong context" am: 2c48d37a29 am: 821e6c7db4
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1866819

Change-Id: I6ce421b3b41858f94f759821d52973e2047eb1f9
2021-10-25 21:31:10 +00:00
Tianjie Xu
821e6c7db4 Merge "Delete the checkin directory with the wrong context" am: 2c48d37a29
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1866819

Change-Id: Ia1fd614583176ced6135b8dfb4be8760273d9eec
2021-10-25 21:13:23 +00:00
Tianjie Xu
2c48d37a29 Merge "Delete the checkin directory with the wrong context" 2021-10-25 20:57:29 +00:00
Tianjie
b2ee9e0771 Delete the checkin directory with the wrong context
http://aosp/1845900 creates the directory with the wrong permission
and context. And when we attempt to fix it in http://aosp/1860276, the
device would fail to boot if the device is already on the bad build.

As a temporarily fix, already delete that checkin directory in vold. And
we can revert the deletion when the droidfood daily polulation gets out
of the bad state.

Bug: 203742483
Test: Update from TP1A.211016.001 and make sure the boot doesn't fail
Change-Id: Iec74528c1fe0e5876acc601e5cd008f99852d269
2021-10-22 18:28:29 +00:00
Tianjie Xu
da45b66919 Merge "Correct the permission of checkin dir" am: 9696432564 am: 5901afa842 am: e224d0827f am: e4f192efd3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1860276

Change-Id: I95933b9dfb86016e666f71af19cc424d126901d1
2021-10-19 22:35:58 +00:00
Tianjie Xu
e4f192efd3 Merge "Correct the permission of checkin dir" am: 9696432564 am: 5901afa842 am: e224d0827f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1860276

Change-Id: Ib71ffd138764df0a6286f5036d76e0e56278dc66
2021-10-19 22:24:46 +00:00
Tianjie Xu
e224d0827f Merge "Correct the permission of checkin dir" am: 9696432564 am: 5901afa842
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1860276

Change-Id: Iad995d454f8e93d0f43f00ab5c0503908a1b3e0e
2021-10-19 22:07:06 +00:00
Tianjie Xu
5901afa842 Merge "Correct the permission of checkin dir" am: 9696432564
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1860276

Change-Id: I114df75669af98d88e71189f60fce2cb1ec3db00
2021-10-19 21:55:26 +00:00
Tianjie Xu
9696432564 Merge "Correct the permission of checkin dir" 2021-10-19 21:37:52 +00:00
Keith Mok
442361140d vold: Reboot if vold failure
Vold stores some status in memory.
If vold crashed and restarted, those status are not
restored. Reboot device if vold on failure.

Bug: 202048432
Test: manually kill vold
Merged-In: Ic56acd9cc906b0166adf805023e34bbd6b3648a5
Change-Id: Ic56acd9cc906b0166adf805023e34bbd6b3648a5
2021-10-18 18:53:30 +00:00
Tianjie
62487c92ba Correct the permission of checkin dir
Gmscore runs in cache group, so set the own:group of the checkin
directory to system:cache to align with other use cases. Because we
want proper user separation when accessing the dir, also provide
user id to set the correct selinux mls_level.

Bug: 197636740
Test: check selinux label, make sure checkin can access the directory.
Change-Id: Id47a2a30a2f37c204ef72a81ac2aebe4ee3a37b0
2021-10-16 13:24:01 -07:00
Keith Mok
d5371be2d4 Merge "vold: Reboot if vold failure" am: 319f778edc am: 05562f4a93 am: 9a6022acac am: 7042fb94cb
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1846798

Change-Id: I0d8b593211aef36d826dcdf99e0f81b9a8dc6ff9
2021-10-16 07:40:16 +00:00
Keith Mok
7042fb94cb Merge "vold: Reboot if vold failure" am: 319f778edc am: 05562f4a93 am: 9a6022acac
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1846798

Change-Id: Idf48a6fe8182ff9289b3b9509aaae8b383367210
2021-10-16 07:24:29 +00:00
Keith Mok
9a6022acac Merge "vold: Reboot if vold failure" am: 319f778edc am: 05562f4a93
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1846798

Change-Id: I1cf471b22e149b4a43c43fbc4671dfde51109814
2021-10-16 07:10:20 +00:00
Keith Mok
05562f4a93 Merge "vold: Reboot if vold failure" am: 319f778edc
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1846798

Change-Id: I02f07af8e5e82a2318614b5fc1b70727db967973
2021-10-16 06:54:27 +00:00
Keith Mok
319f778edc Merge "vold: Reboot if vold failure" 2021-10-16 06:39:29 +00:00
Tianjie Xu
061ea29035 Merge "Create the checkin subdirectory under misc_ce" am: 45d04fb4a2 am: 0cc0755bf7 am: a77f71630f am: ab2920ddb1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1845900

Change-Id: I4b2ce961f6f9f5e743dd71eefd0d2f4bbe2aa809
2021-10-15 22:19:24 +00:00
Tianjie Xu
ab2920ddb1 Merge "Create the checkin subdirectory under misc_ce" am: 45d04fb4a2 am: 0cc0755bf7 am: a77f71630f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1845900

Change-Id: I19235c483c94300045e484f90e9f6021b71e5a52
2021-10-15 22:02:46 +00:00
Tianjie Xu
a77f71630f Merge "Create the checkin subdirectory under misc_ce" am: 45d04fb4a2 am: 0cc0755bf7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1845900

Change-Id: I5ed1105c556c50d73ad22beae2db82e7dc3aa371
2021-10-15 21:51:11 +00:00
Tianjie Xu
0cc0755bf7 Merge "Create the checkin subdirectory under misc_ce" am: 45d04fb4a2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1845900

Change-Id: Ibd90bc3f7b20eac8dec03067fdbb1c64ac6225d5
2021-10-15 21:33:13 +00:00
Tianjie Xu
45d04fb4a2 Merge "Create the checkin subdirectory under misc_ce" 2021-10-15 21:19:26 +00:00
Keun-young Park
8ebe4cb6d6 Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0 am: d9f2335ab7 am: 64ce88543b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1856933

Change-Id: I8f5108e4e46f5657e24523c5346dbab175d9e5e8
2021-10-14 22:08:39 +00:00
Keun-young Park
64ce88543b Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0 am: d9f2335ab7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1856933

Change-Id: I1807a992b19e8f8fffd7425a5cc390e358b7c0d8
2021-10-14 22:01:15 +00:00
Keun-young Park
d9f2335ab7 Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1856933

Change-Id: I0a3dd874fd00d7b35a47ed1067836b597f5961ca
2021-10-14 21:49:05 +00:00
Keun-young Park
22b0c0fca0 Merge "Fix vold dump" am: bba0592dce
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1856933

Change-Id: I6f6b0d3a00dd9d27ec47f7f06a44c463df3b9d0b
2021-10-14 21:39:10 +00:00
Keun-young Park
bba0592dce Merge "Fix vold dump" 2021-10-14 21:19:30 +00:00
Keun young Park
0bccae2070 Fix vold dump
- Original code of re-opening /proc/self/fd/fd does not work
  due to selinux violation.
- fd (=pipe) passed over binder should be used as it is.

Bug: 202999256
Test: $ adb shell su root dumpsys vold
Change-Id: I1fceba89f1b07228e1677c266f87e431e93f7cb5
2021-10-13 16:50:10 -07:00
Xin Li
663b2c7cb2 [automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours am: ad3c475452 -s ours am: 20bdf84535 -s ours am: b6c257d37f -s ours
am skip reason: Merged-In I9d1b60b1bddeade81238cc971d38a5de76f748d5 with SHA-1 af91a5ec2d is already in history

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

Change-Id: Ifc9d23b7169673fbe861f25d02483bbceaf55d4b
2021-10-08 08:29:42 +00:00
Xin Li
b6c257d37f [automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours am: ad3c475452 -s ours am: 20bdf84535 -s ours
am skip reason: Merged-In I9d1b60b1bddeade81238cc971d38a5de76f748d5 with SHA-1 af91a5ec2d is already in history

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

Change-Id: I026ad515c20a042f87d3ce580c28745e68c0f939
2021-10-08 07:56:44 +00:00
Xin Li
20bdf84535 [automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours am: ad3c475452 -s ours
am skip reason: Merged-In I9d1b60b1bddeade81238cc971d38a5de76f748d5 with SHA-1 af91a5ec2d is already in history

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

Change-Id: Iad7911fc440b61df02311913865e49f6eb56de34
2021-10-08 01:39:29 +00:00
Xin Li
ad3c475452 [automerger skipped] Merge "Merge Android 12" am: 97e69c9529 -s ours
am skip reason: Merged-In I9d1b60b1bddeade81238cc971d38a5de76f748d5 with SHA-1 af91a5ec2d is already in history

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

Change-Id: I463a0a99d587e9802c49a58fd36326dec26ddf31
2021-10-08 01:20:03 +00:00
Xin Li
97e69c9529 Merge "Merge Android 12" 2021-10-07 23:50:41 +00:00
Xin Li
0f3734a07e Merge Android 12
Bug: 202323961
Merged-In: I9d1b60b1bddeade81238cc971d38a5de76f748d5
Change-Id: Ic882ab8446d7c9012d344acdbb3911f6be7cd285
2021-10-06 22:55:15 +00:00
Keith Mok
c73dbac02d vold: Reboot if vold failure
Vold stores some status in memory.
If vold crashed and restarted, those status are not
restored. Reboot device if vold on failure.

Bug: 202048432
Test: manually kill vold
Change-Id: Ic56acd9cc906b0166adf805023e34bbd6b3648a5
2021-10-06 18:47:37 +00:00
Tianjie
570f0585b9 Create the checkin subdirectory under misc_ce
We need some storage on the device to backup the token for checkin
services. So users won't lose the checkin tokens when they clear
the app's storage. If the device accidentally loses the
token without backup, it won't be able to checkin again until
factory reset.

Because we want the token to be user specific, put it under misc_ce
and let vold create the sub-directory.

Bug: 197636740
Test: boot device, check selinux label of the dir
Change-Id: I0e19dcb7f4feb98fd9d1013cfd84b56ff1325373
2021-10-05 22:17:22 -07:00
David Anderson
a9192f8296 Merge "Pre-create userdata metadata encryption device." am: eb3182f040 am: af91a5ec2d am: a53bd16bc1 am: 598a02969f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1833056

Change-Id: Idc962b724ee77d79b925064337e30df571ee2bbe
2021-09-27 21:00:47 +00:00
David Anderson
598a02969f Merge "Pre-create userdata metadata encryption device." am: eb3182f040 am: af91a5ec2d am: a53bd16bc1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1833056

Change-Id: I033738b64c71eb19c5f4aec5c01f8bd72cc82aaa
2021-09-27 20:47:55 +00:00
David Anderson
a53bd16bc1 Merge "Pre-create userdata metadata encryption device." am: eb3182f040 am: af91a5ec2d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1833056

Change-Id: I608710e90fb6a7b80532eb90035909567d60b829
2021-09-27 20:32:58 +00:00
David Anderson
af91a5ec2d Merge "Pre-create userdata metadata encryption device." am: eb3182f040
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1833056

Change-Id: I9d1b60b1bddeade81238cc971d38a5de76f748d5
2021-09-27 20:16:47 +00:00
David Anderson
eb3182f040 Merge "Pre-create userdata metadata encryption device." 2021-09-27 20:01:24 +00:00
Daniel Rosenberg
d9261b1f0b Add timeout for fsck on untrusted media
Certain setups of cards can take a long time to fsck.
This adds a timeout to avoid angering the watchdog

Bug: 195615825
Test: Mount removable storage with ~30K folders,
      obeserve timeout in logs
Change-Id: I8b6e2658cf7024645f976599851bbee0557745ca
2021-09-22 18:08:28 -07:00
Howard Chen
01c95128fd Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577 am: 9c2577b823 am: fc8d1c7d37 am: 9c14e615a9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1826054

Change-Id: Ibb93e156fa54339776c31446942af62df13b128b
2021-09-22 05:03:04 +00:00
Howard Chen
9c14e615a9 Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577 am: 9c2577b823 am: fc8d1c7d37
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1826054

Change-Id: I8244e7724d26dba47b38c586945cb4cff4122167
2021-09-22 04:49:16 +00:00
Howard Chen
fc8d1c7d37 Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577 am: 9c2577b823
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1826054

Change-Id: I5236ae0e54e9c95576f1b4b2ac58544d3a0468f0
2021-09-22 04:36:51 +00:00
Howard Chen
9c2577b823 Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1826054

Change-Id: I55554e2a0545de6a747e44f5967534fe16d1341a
2021-09-22 04:22:35 +00:00
Howard Chen
d718c8c577 Merge "Make the deleteAllKey feature aware of the DSU mode" 2021-09-22 04:09:18 +00:00
David Anderson
156d9d2293 Pre-create userdata metadata encryption device.
CreateDevice() implicitly calls WaitForDevice(), which can impact boot
time if there are many uevents waiting to be processed. To alleviate
this, create an empty "userdata" device when vold starts (if metada
encryption is enabled). When it comes time to actually enable metadata
encryption, the device can be re-used and the subsequent Wait should be
much faster.

Bug: 198405417
Test: manual test; device boots
Change-Id: Iaacd10858272f17353475e25075ea1dda13f8fc4
2021-09-21 17:25:33 -07:00
Daniel Rosenberg
bf19f0a80b Merge "Fix the incorrect parameter quota when userdata is formatted with EXT4" am: 8bd25f8e74 am: 9788b022dd am: b476bc2041 am: a911c46678
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1825558

Change-Id: I95d29f504d329cd6b3d848260384dc3e559f411f
2021-09-20 22:46:28 +00:00
Daniel Rosenberg
a911c46678 Merge "Fix the incorrect parameter quota when userdata is formatted with EXT4" am: 8bd25f8e74 am: 9788b022dd am: b476bc2041
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1825558

Change-Id: I8ccd657f612eb28d35d545b6e8bc1321531ec3f5
2021-09-20 22:31:41 +00:00