tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1821 commits 1 branch 0 tags 9.7 MiB
Commit graph

1821 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Rosenberg
1584dc0d1d Merge "Remove waitpid on UnMount" 
am: f6dbba8846

Change-Id: I4e96e702bc9b2251cc2801a037177a2f7a154c75
 2018-04-03 13:37:19 -07:00
Treehugger Robot
f6dbba8846 Merge "Remove waitpid on UnMount" 2018-04-03 20:23:59 +00:00
Daniel Rosenberg
8b9a5b344e Remove waitpid on UnMount 
Since we no longer have the Fuse Daemon, we won't ever
need to stop the daemon when unmounting.

Bug: 33808187
Test: Run "adb shell ps | grep -w Z"
          The sdcard daemon should not be listed.
Change-Id: I6bb9341785b711d81553393f7c3b56115c435236
 2018-03-13 02:58:03 +00:00
Gao Xiang
8be3be3167 Merge "mFusePid should be cleared after waitpid successfully" 
am: 456483d193

Change-Id: I61bf49cea396ebc8009a54740d7322249025acf0
 2018-02-16 01:04:45 +00:00
Treehugger Robot
456483d193 Merge "mFusePid should be cleared after waitpid successfully" 2018-02-15 23:46:14 +00:00
Jeff Sharkey
c1d81682e1 Merge "Remove FIDTRIM." 
am: 35829f3968

Change-Id: I02bb4438d08a34cf0f8e41a8a7fd2123c492be38
 2018-01-12 20:43:37 +00:00
Jeff Sharkey
35829f3968 Merge "Remove FIDTRIM." 2018-01-12 20:20:15 +00:00
Jeff Sharkey
9b73845fe8 Remove FIDTRIM. 
Remove FIDTRIM support, which isn't meaningful on UFS-based flash
devices.  Modern devices require FBE/FDE which gives us better
protection against trimmed data lingering around.

Bug: 67041047
Test: builds, boots
Change-Id: I38d7d6961edf2047592b87c74b2a0f5906fb54e2
Merged-In: I4fb194c5d5ef13f413c02acedfbaaf79c567582b
 2018-01-12 10:43:23 -07:00
Chih-hung Hsieh
447f1874b4 Merge "Fix warning in system/vold/tests." 
am: b96ed7e6e0

Change-Id: I0d8dbf26cd9769307adc0a1ce0d4d02a8bff9382
 2017-12-11 23:28:47 +00:00
Chih-hung Hsieh
b96ed7e6e0 Merge "Fix warning in system/vold/tests." 2017-12-11 23:22:58 +00:00
Chih-Hung Hsieh
a827f55629 Fix warning in system/vold/tests. 
* Comment out unused function.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I18db09be2ff8ef27f822876a6832ca5f08ce939f
Merged-In: I7a23573af0d664a5f39f1cde3a22ac0001dac1ac
 2017-12-07 14:18:34 -08:00
Xin Li
d0271a642a Merge "DO NOT MERGE: Merge Oreo MR1 into master" 
am: 56b0e8c1df  -s ours

Change-Id: I632ac4d7b22928b78579ccd6e99a17c516f18809
 2017-12-07 19:37:04 +00:00
Xin Li
00a2c10b44 DO NOT MERGE: Merge Oreo MR1 into master 
am: 1843c887d4  -s ours

Change-Id: Ie3ef381ae67fa4e1761ff96e91fef55a959215d4
 2017-12-07 04:53:08 +00:00
Gao Xiang
9aec7a2fb6 mFusePid should be cleared after waitpid successfully 
When waitpid is successful, we need to reset mFusePid
since mFusePid will be killed again unnecessarily
in doUnmount() if we don't reset mFusePid.

As a result, it will kill another unrelated process
in the case of pids wrap around.

Test: reboot
Fixes: 1d79d10 ("Check if sdcard daemon exited.")

Change-Id: Icb422d5c81621f9f6b9f4b1218e94b1d89172763
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
 2017-12-07 11:37:19 +08:00
Xin Li
56b0e8c1df Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:28 +00:00
Xin Li
1843c887d4 DO NOT MERGE: Merge Oreo MR1 into master 
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ic7e2e2d1ef7bf17a9c81ea30d759fd9fe0a218c7
 2017-12-06 14:24:58 -08:00
Pierre-Hugues Husson
5687befd86 Merge "Workaround perdev_minors path change in Linux" 
am: d3870c5167

Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771
 2017-11-28 18:59:56 +00:00
Treehugger Robot
d3870c5167 Merge "Workaround perdev_minors path change in Linux" 2017-11-28 18:45:30 +00:00
Pierre-Hugues Husson
f347cd0249 Workaround perdev_minors path change in Linux 
This upstream Linux change has been discussed at https://patchwork.kernel.org/patch/8281851/
And included in AOSP in https://android-review.googlesource.com/c/kernel/common/+/202752
Some devices have been released without it, so we need this change to
have a working SDcard on those devices.

Change-Id: I323d85bd8381f82b75db09493ddc22f432cec548
 2017-11-28 17:53:42 +01:00
Paul Crowley
2b1b72d183 Merge "Key upgrading for FDE." 
am: 997e605563

Change-Id: If2ca4a6bd3b7a2b36b6c092975bcfdde8e063a3e
 2017-11-27 20:59:33 +00:00
Treehugger Robot
997e605563 Merge "Key upgrading for FDE." 2017-11-27 20:55:51 +00:00
Paul Crowley
73473337d8 Key upgrading for FDE. 
Correctly handle a key upgrade error from keymaster by upgrading the
FDE RSA key and writing the new key blob to disk.

Bug: 69792304
Test: Roll back PLATFORM_SECURITY_PATCH a month, wipe and reboot, roll
      forwards again, check logs with and without this patch.
Change-Id: I220d2dd4e3d791f636e9bc5f063064cecbf1b88a
 2017-11-27 10:34:18 -08:00
Xin Li
bf168f7dad Merge commit 'e2d1d99f1a98b02a28fe71f2a387a72b69d4b4a6' from 
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I4bdada4c933109f1cc60c61946fa30e174ca7583
 2017-11-14 12:20:56 -08:00
Jaegeuk Kim
4d1c7765c8 Merge "cryptfs: support make_f2fs with quota" 
am: 7807866abe

Change-Id: I9b52d87df0a6ddc3c29b4bd5d302e300747ad4c1
 2017-11-14 01:10:34 +00:00
Jaegeuk Kim
af285d98b8 Merge "cryptfs: call format_f2fs correctly with proper flags" 
am: b9a1169eca

Change-Id: I7ad4229ee514d80fc3280d8f468844a3b5eb9137
 2017-11-14 01:10:17 +00:00
Treehugger Robot
7807866abe Merge "cryptfs: support make_f2fs with quota" 2017-11-14 01:06:37 +00:00
Jaegeuk Kim
b9a1169eca Merge "cryptfs: call format_f2fs correctly with proper flags" 2017-11-14 01:06:27 +00:00
Jaegeuk Kim
8de9f065a4 cryptfs: support make_f2fs with quota 
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 2017-11-13 13:54:16 -08:00
Jaegeuk Kim
98651a235b cryptfs: call format_f2fs correctly with proper flags 
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
 2017-11-13 13:16:45 -08:00
Jeff Vander Stoep
c923127e23 Merge "Check that dir name is a pid before attempting to read" 
am: 6419445383

Change-Id: I8b7639934bcee660bcd84f83afae5cc2c17bae15
 2017-10-24 17:19:58 +00:00
Treehugger Robot
6419445383 Merge "Check that dir name is a pid before attempting to read" 2017-10-24 17:15:03 +00:00
Jeff Vander Stoep
a997db73d6 Check that dir name is a pid before attempting to read 
Prevents selinux denials for folders in /proc that do not have the
default /proc label.

Bug: 68146208
Test: no selinux denials for vold attempting to read proc_asound dir.
Merged-In: I7cdd3bbe8e687e078372012773e9a34a5c76e0f8
Change-Id: I7cdd3bbe8e687e078372012773e9a34a5c76e0f8
 2017-10-24 14:04:27 +00:00
Chih-hung Hsieh
7718457dfc Merge "Use -Werror in system/vold/tests" 
am: d6d0e91c62

Change-Id: Idc41239ba5d67954dfb7d6e61e31768dafdd3599
 2017-10-19 23:18:12 +00:00
Chih-hung Hsieh
d6d0e91c62 Merge "Use -Werror in system/vold/tests" 2017-10-19 22:33:52 +00:00
Chih-Hung Hsieh
27c0d952cb Use -Werror in system/vold/tests 
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ied1f6160124d10d81151d401ed4a0b089816abb3
 2017-10-19 10:07:38 -07:00
Paul Crowley
e2d1d99f1a Merge "Remove CheckBattery altogether" into stage-aosp-master am: db436c7999 
am: 45aa0f6c51

Change-Id: I91e0b067e313869417b8b18d9f65f8d0f2acc894
 2017-10-04 05:29:30 +00:00
Paul Crowley
45aa0f6c51 Merge "Remove CheckBattery altogether" into stage-aosp-master 
am: db436c7999

Change-Id: I65e49db994bbfe266772fa36ed97bee4e4468d5b
 2017-10-04 05:27:10 +00:00
TreeHugger Robot
db436c7999 Merge "Remove CheckBattery altogether" into stage-aosp-master 2017-10-04 05:22:11 +00:00
Paul Crowley
db324f795a Merge "Remove CheckBattery altogether" am: 2890b8d215 -s ours am: 90a9c44f9d 
am: 68b565336b

Change-Id: I88aa538f2bfb210ce185784ee2c95b70080718e4
 2017-10-04 04:43:55 +00:00
Paul Crowley
68b565336b Merge "Remove CheckBattery altogether" am: 2890b8d215 -s ours 
am: 90a9c44f9d

Change-Id: Ie6d021923c2fe396d954b4df07eb293a9cf3dd6d
 2017-10-04 04:41:42 +00:00
Paul Crowley
90a9c44f9d Merge "Remove CheckBattery altogether" 
am: 2890b8d215  -s ours

Change-Id: I3ad2174feea5d62b9bcff2119032abd80254d77c
 2017-10-04 04:39:22 +00:00
Paul Crowley
584610f325 Remove CheckBattery altogether 
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
 2017-10-03 21:38:15 -07:00
Treehugger Robot
2890b8d215 Merge "Remove CheckBattery altogether" 2017-10-03 23:19:02 +00:00
Paul Crowley
de90f76fe2 Remove CheckBattery altogether 
am: a04014bf26

Change-Id: I7aefe1d6f4815a7f02671869fe940a3cdd13cd70
 2017-10-03 22:08:31 +00:00
Paul Crowley
a04014bf26 Remove CheckBattery altogether 
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
 2017-10-03 10:45:23 -07:00
Paul Crowley
1b992e4f26 Remove CheckBattery altogether 
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
 2017-10-02 16:20:49 -07:00
Yifan Hong
da59b50f70 Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e am: 2313818c46 
am: a6f34f6e78

Change-Id: I824e6e9285013895bc989e2667e297e130b6e1af
 2017-09-28 18:32:23 +00:00
Yifan Hong
a6f34f6e78 Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e 
am: 2313818c46

Change-Id: I1faae4261398a107aee274a7b6a4b05766786257
 2017-09-28 18:30:01 +00:00
Yifan Hong
2313818c46 Merge "vold: remove unnecessary dependency on libbatteryservice." 
am: 7b0ac6d37e

Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7
 2017-09-28 18:21:49 +00:00
Treehugger Robot
7b0ac6d37e Merge "vold: remove unnecessary dependency on libbatteryservice." 2017-09-28 18:14:42 +00:00