Commit graph

4242 commits

Author SHA1 Message Date
David Anderson
aaa78ed111 [automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 -s ours am: f1353b9ec4 -s ours am: 5280868006 -s ours
am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 7e07c53aab is in history

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

Change-Id: I7f5a6d29f4320f36b3172c8e45fdd7727a2138a6
2020-06-19 20:47:10 +00:00
David Anderson
2a82c73b0c [automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 am: 9f054be265 -s ours am: c01c899abf -s ours
am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 7e07c53aab is in history

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

Change-Id: Ia9fd42e0dbee3393fdee42d8db27b96fb5b4ee12
2020-06-19 20:47:01 +00:00
David Anderson
40777bfa1f [automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 am: 9f054be265 am: abf4d6a58e -s ours
am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 23850d30f6 is in history

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

Change-Id: I7f7aa0fe8fb933a16149aef38124e89bf112c971
2020-06-19 20:46:36 +00:00
David Anderson
abf4d6a58e Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 am: 9f054be265
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11917729

Change-Id: I6d255fe56cc04895887417d2eced22cb0f8ea0e5
2020-06-19 20:33:54 +00:00
David Anderson
5280868006 [automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 -s ours am: f1353b9ec4 -s ours
am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 7e07c53aab is in history

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

Change-Id: Ibef61ff852185c8a35fdf071f40b01b60dc371fe
2020-06-19 20:33:50 +00:00
David Anderson
c01c899abf [automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 am: 9f054be265 -s ours
am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 23850d30f6 is in history

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

Change-Id: I8107dbfcea17dde5dccedb8b2abb2f8c5223c31d
2020-06-19 20:33:37 +00:00
David Anderson
f1353b9ec4 [automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 -s ours
am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 23850d30f6 is in history

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

Change-Id: I324e156e155f361491f963518f69a956ac23dd7f
2020-06-19 20:21:48 +00:00
David Anderson
9f054be265 Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11917729

Change-Id: I9169d3e70a48b2efb3884869c412519fb1393d02
2020-06-19 20:21:40 +00:00
David Anderson
f87198e025 Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev 2020-06-19 20:04:54 +00:00
TreeHugger Robot
b166472895 [automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: 3c9703d0a0 am: 0b583bcf16 -s ours
am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 67f9044ab5 is in history

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

Change-Id: I8c7c0544485998e6507c211400fc33dba2ea5a52
2020-06-18 23:08:30 +00:00
David Anderson
7e07c53aab Add an isCheckpointing() binder call for adb remount.
This is needed so "adb remount" can avoid writing to /data during a
checkpoint.

Bug: 157540389
Test: manual test
Change-Id: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1
Merged-In: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1
2020-06-18 16:04:36 -07:00
TreeHugger Robot
d1882bf48f [automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: 3c9703d0a0 -s ours am: ea4f2b73cf -s ours
am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 67f9044ab5 is in history

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

Change-Id: I148c3b448f6ac57bcce2d3b814e170cb60537f02
2020-06-18 22:56:03 +00:00
TreeHugger Robot
0092c5f1c0 [automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df -s ours am: c6e83ca68d -s ours am: c2369905b8 -s ours
am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 3fe931109c is in history

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

Change-Id: I342c4e4657fab41864c7aec47712d4dcc3d1ffa9
2020-06-18 22:55:37 +00:00
Paul Lawrence
c7f51c8c37 Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339 am: ebc8801fb3 am: f2a3877555
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330879

Change-Id: I7188ee3168814b03b8d4e951fd3e26e48a010744
2020-06-18 22:53:09 +00:00
TreeHugger Robot
0b583bcf16 Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: 3c9703d0a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11886461

Change-Id: Ie03214b795767065fbbe3b8ba071c68b244a0078
2020-06-18 22:53:01 +00:00
David Anderson
ad64b38c0a Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96 am: 60e41b7084 am: 026ae1a9ac am: 3fe914dd6a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330854

Change-Id: I3d88a258147fcc3b454e339d081159d46bd6f982
2020-06-18 22:52:59 +00:00
TreeHugger Robot
ea4f2b73cf [automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: 3c9703d0a0 -s ours
am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 67f9044ab5 is in history

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

Change-Id: Id88e6555c441c9c88a54d5b835ea7f531cf51716
2020-06-18 22:52:49 +00:00
TreeHugger Robot
c2369905b8 [automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df -s ours am: c6e83ca68d -s ours
am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 3fe931109c is in history

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

Change-Id: I8fbea2c9dce8055fea94dc9dabe0cce2bdd6b5c4
2020-06-18 22:36:32 +00:00
Paul Lawrence
f2a3877555 Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339 am: ebc8801fb3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330879

Change-Id: Iab701b88377b966aef876d9349dae42341ea0c83
2020-06-18 22:36:21 +00:00
TreeHugger Robot
c6e83ca68d [automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df -s ours
am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 3fe931109c is in history

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

Change-Id: I4559e77b9ea60cf49f4824dc93a6a6141b9fb94b
2020-06-18 22:36:16 +00:00
David Anderson
3fe914dd6a Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96 am: 60e41b7084 am: 026ae1a9ac
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330854

Change-Id: I4739db7174b247defd39291aad8915dfefc1d1cc
2020-06-18 22:36:07 +00:00
TreeHugger Robot
3c9703d0a0 Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11886461

Change-Id: I9e69b6817d8a3b34e053b86c9c33c3f7f466ec71
2020-06-18 22:35:32 +00:00
TreeHugger Robot
14d4e7c7df Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev 2020-06-18 22:22:58 +00:00
Paul Lawrence
ebc8801fb3 Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330879

Change-Id: I54fdd3098c52dcb53cee0956f4dd1e43e09f5800
2020-06-18 22:16:14 +00:00
David Anderson
026ae1a9ac Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96 am: 60e41b7084
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330854

Change-Id: I0aa0536cfd33f189525115efa07e49930f53b79a
2020-06-18 22:15:56 +00:00
Paul Lawrence
53f1d07339 Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330879

Change-Id: Ifa48af749baa5d50c7459dbb5bda1573d847b622
2020-06-18 22:00:47 +00:00
David Anderson
60e41b7084 Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330854

Change-Id: I14674da2b3cf86c09179b94e28e76fec30378e12
2020-06-18 22:00:37 +00:00
Paul Lawrence
67f9044ab5 Don't call block checkpoint functions above dm-default-key
Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Merged-In: Ic15fadc67d306463dd0b554f679306d8f9081451
Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451
2020-06-18 21:58:32 +00:00
Paul Lawrence
1bb7e8a928 Merge "Don't call block checkpoint functions above dm-default-key" 2020-06-18 21:56:10 +00:00
David Anderson
b50480bb96 Merge "Add an isCheckpointing() binder call for adb remount." 2020-06-18 21:45:21 +00:00
Automerger Merge Worker
d264153be4 Merge "Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c" into rvc-d1-dev-plus-aosp am: 1c834651ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: Iefaf1aed2656b40192b4fa46f927e7c6af6cf0f6
2020-06-17 17:27:13 +00:00
Nikita Ioffe
c864e1c123 Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 356baaa10a am: 527576e053
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I7693dfc40c37797d24d8ebe1acce01ce74c749c2
2020-06-17 17:26:41 +00:00
Nikita Ioffe
f325f2ba7c Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c am: ee31d7a050
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I529a5b90aee69c5b11bf4e2b8e5d9385bcb76d4d
2020-06-17 17:26:30 +00:00
Nikita Ioffe
ee31d7a050 Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: Ia366a51e037bebda0d828b17eade626b91a9bf68
2020-06-17 17:12:05 +00:00
Automerger Merge Worker
1c834651ab Merge "Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c" into rvc-d1-dev-plus-aosp 2020-06-17 17:11:59 +00:00
Nikita Ioffe
5268ad04a7 Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I13fee40e133ae4795b92cf95ff818b77aa4ef5bf
2020-06-17 17:11:55 +00:00
Nikita Ioffe
527576e053 Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 356baaa10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: Idae0195c2db9192e54d8a31aff8072e82d93f798
2020-06-17 17:11:54 +00:00
Nikita Ioffe
356baaa10a Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I90e3ab660ddb356bd7c0212e188b997f6bfa07d4
2020-06-17 16:53:30 +00:00
Nikita Ioffe
7e29904e8c Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I16f0f0b5925c503c66d1d7b14687232b9c30f782
2020-06-17 16:53:01 +00:00
Nikita Ioffe
bcd7d5e7ce Merge "Configure read ahead for fuse mounts" into rvc-dev 2020-06-17 16:37:37 +00:00
Nikita Ioffe
dcee5c1d21 Configure read ahead for fuse mounts
For fuse read ahead can be configured by writing a value to the
/sys/class/bdi/{MAJOR}:{MINOR}/read_ahead_kb file.

There are several different ways of getting {MAJOR}:{MINOR} values of
the filesystem:

* Look at st_dev of stat("/mnt/user/0/emulated").
* Parse /proc/self/mountinfo.

Stat'ing approach is used since it's easier to implement.

Bug: 157982297
Test: atest vold_tests
Test: adb shell cat /proc/self/mountinfo to get MAJOR:MINOR
Test: adb shell cat /sys/class/bdi/{MAJOR}:{MINOR}/read_ahead_kb
Test: created public volume, checked it's read_ahead_kb is also 256
Change-Id: Id0c149c4af1ceabf3afc33b4100563a512b38316
2020-06-17 15:58:25 +01:00
Martijn Coenen
e4d7be79c3 Add app's own UID to the default ACL. am: 1129b81071 am: 55565a991f am: c5ce51cc7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: I37d2748db90dfecc283550b434d4e2507aed57e7
2020-06-17 07:34:01 +00:00
Automerger Merge Worker
0e18aca2f0 Merge "Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850" into rvc-d1-dev-plus-aosp am: 7b181d2344
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Ic025e3023582dfa88ee871453cb252b73a49e146
2020-06-17 07:33:45 +00:00
Martijn Coenen
539c7d6944 Add app's own UID to the default ACL. am: 1129b81071 am: 55565a991f am: 615d7752c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Ie7063469687615cfef2e4fed0d033c2848594cbe
2020-06-17 07:33:31 +00:00
Automerger Merge Worker
7b181d2344 Merge "Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850" into rvc-d1-dev-plus-aosp 2020-06-17 07:17:12 +00:00
Martijn Coenen
bbc2c8babc Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Ifcd1d4acd9e7e4077e50004d4ed35650e1c6af48
2020-06-17 07:17:08 +00:00
Martijn Coenen
c5ce51cc7c Add app's own UID to the default ACL. am: 1129b81071 am: 55565a991f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: I12878459555339919d8696da80df67e45a138ceb
2020-06-17 07:16:58 +00:00
Martijn Coenen
615d7752c1 Add app's own UID to the default ACL. am: 1129b81071 am: 55565a991f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Iaec02373329881afa98db8cae68410fccd5d3e00
2020-06-17 07:16:57 +00:00
Martijn Coenen
53b6f32850 Add app's own UID to the default ACL. am: 1129b81071
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Icbff1ee04a5f79582e92d5fa8ed8913260cc417f
2020-06-17 07:01:58 +00:00
Martijn Coenen
55565a991f Add app's own UID to the default ACL. am: 1129b81071
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Icff0c7db7e572aedb6da75c38bdea08c204e087e
2020-06-17 07:01:53 +00:00