Xin Li
56b0e8c1df
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
7 years ago
Xin Li
1843c887d4
DO NOT MERGE: Merge Oreo MR1 into master
...
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ic7e2e2d1ef7bf17a9c81ea30d759fd9fe0a218c7
7 years ago
Pierre-Hugues Husson
5687befd86
Merge "Workaround perdev_minors path change in Linux"
...
am: d3870c5167
Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771
7 years ago
Treehugger Robot
d3870c5167
Merge "Workaround perdev_minors path change in Linux"
7 years ago
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
7 years ago
Paul Crowley
2b1b72d183
Merge "Key upgrading for FDE."
...
am: 997e605563
Change-Id: If2ca4a6bd3b7a2b36b6c092975bcfdde8e063a3e
7 years ago
Treehugger Robot
997e605563
Merge "Key upgrading for FDE."
7 years ago
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
7 years ago
Xin Li
bf168f7dad
Merge commit 'e2d1d99f1a98b02a28fe71f2a387a72b69d4b4a6' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: I4bdada4c933109f1cc60c61946fa30e174ca7583
7 years ago
Jaegeuk Kim
4d1c7765c8
Merge "cryptfs: support make_f2fs with quota"
...
am: 7807866abe
Change-Id: I9b52d87df0a6ddc3c29b4bd5d302e300747ad4c1
7 years ago
Jaegeuk Kim
af285d98b8
Merge "cryptfs: call format_f2fs correctly with proper flags"
...
am: b9a1169eca
Change-Id: I7ad4229ee514d80fc3280d8f468844a3b5eb9137
7 years ago
Treehugger Robot
7807866abe
Merge "cryptfs: support make_f2fs with quota"
7 years ago
Jaegeuk Kim
b9a1169eca
Merge "cryptfs: call format_f2fs correctly with proper flags"
7 years ago
Jaegeuk Kim
8de9f065a4
cryptfs: support make_f2fs with quota
...
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
7 years ago
Jaegeuk Kim
98651a235b
cryptfs: call format_f2fs correctly with proper flags
...
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
7 years ago
Jeff Vander Stoep
c923127e23
Merge "Check that dir name is a pid before attempting to read"
...
am: 6419445383
Change-Id: I8b7639934bcee660bcd84f83afae5cc2c17bae15
7 years ago
Treehugger Robot
6419445383
Merge "Check that dir name is a pid before attempting to read"
7 years ago
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
7 years ago
Chih-hung Hsieh
7718457dfc
Merge "Use -Werror in system/vold/tests"
...
am: d6d0e91c62
Change-Id: Idc41239ba5d67954dfb7d6e61e31768dafdd3599
7 years ago
Chih-hung Hsieh
d6d0e91c62
Merge "Use -Werror in system/vold/tests"
7 years ago
Chih-Hung Hsieh
27c0d952cb
Use -Werror in system/vold/tests
...
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ied1f6160124d10d81151d401ed4a0b089816abb3
7 years ago
Paul Crowley
e2d1d99f1a
Merge "Remove CheckBattery altogether" into stage-aosp-master am: db436c7999
...
am: 45aa0f6c51
Change-Id: I91e0b067e313869417b8b18d9f65f8d0f2acc894
7 years ago
Paul Crowley
45aa0f6c51
Merge "Remove CheckBattery altogether" into stage-aosp-master
...
am: db436c7999
Change-Id: I65e49db994bbfe266772fa36ed97bee4e4468d5b
7 years ago
TreeHugger Robot
db436c7999
Merge "Remove CheckBattery altogether" into stage-aosp-master
7 years ago
Paul Crowley
db324f795a
Merge "Remove CheckBattery altogether" am: 2890b8d215
-s ours am: 90a9c44f9d
...
am: 68b565336b
Change-Id: I88aa538f2bfb210ce185784ee2c95b70080718e4
7 years ago
Paul Crowley
68b565336b
Merge "Remove CheckBattery altogether" am: 2890b8d215
-s ours
...
am: 90a9c44f9d
Change-Id: Ie6d021923c2fe396d954b4df07eb293a9cf3dd6d
7 years ago
Paul Crowley
90a9c44f9d
Merge "Remove CheckBattery altogether"
...
am: 2890b8d215
-s ours
Change-Id: I3ad2174feea5d62b9bcff2119032abd80254d77c
7 years ago
Paul Crowley
584610f325
Remove CheckBattery altogether
...
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
7 years ago
Treehugger Robot
2890b8d215
Merge "Remove CheckBattery altogether"
7 years ago
Paul Crowley
de90f76fe2
Remove CheckBattery altogether
...
am: a04014bf26
Change-Id: I7aefe1d6f4815a7f02671869fe940a3cdd13cd70
7 years ago
Paul Crowley
a04014bf26
Remove CheckBattery altogether
...
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
7 years ago
Paul Crowley
1b992e4f26
Remove CheckBattery altogether
...
Test: changed Angler fstab to encryptable and encrypted.
Bug: 16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
7 years ago
Yifan Hong
da59b50f70
Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e
am: 2313818c46
...
am: a6f34f6e78
Change-Id: I824e6e9285013895bc989e2667e297e130b6e1af
7 years ago
Yifan Hong
a6f34f6e78
Merge "vold: remove unnecessary dependency on libbatteryservice." am: 7b0ac6d37e
...
am: 2313818c46
Change-Id: I1faae4261398a107aee274a7b6a4b05766786257
7 years ago
Yifan Hong
2313818c46
Merge "vold: remove unnecessary dependency on libbatteryservice."
...
am: 7b0ac6d37e
Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7
7 years ago
Treehugger Robot
7b0ac6d37e
Merge "vold: remove unnecessary dependency on libbatteryservice."
7 years ago
Yifan Hong
57838d665f
vold: remove unnecessary dependency on libbatteryservice.
...
Battery check could be replaced by hwbinder calls into
android.hardware.health@2.0 instead, but because
of b/16868177, this is actually not needed.
Bug: 62229583
Test: pass
Change-Id: Ieb03e6ee2f648d9c1d85dbbdc10626726f5fe39b
7 years ago
Rom Lemarchand
958c216d87
Revert "Revert "Add support for gid derivation on private volumes""
...
This reverts commit a3a60b372e
.
Reason for revert: All kernel prebuilts merged
(cherry picked from commit 75ae529bf8
)
Bug: 65600849
Bug: 65573871
Test: m
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
7 years ago
Richard Uhler
4a921633fa
Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
am: 6b264e4a4c
...
am: 3ed63e8d21
Change-Id: Ie3abbe2dee226330576e42b44910652ff272eb74
7 years ago
Richard Uhler
3ed63e8d21
Merge "Revert "Add support for gid derivation on private volumes"" am: 9588da7095
...
am: 6b264e4a4c
Change-Id: Ic617080e8f98079bd3075621dc85f5dfa00ff5ba
7 years ago
Richard Uhler
6b264e4a4c
Merge "Revert "Add support for gid derivation on private volumes""
...
am: 9588da7095
Change-Id: Ie2e32cca7542cdc1aaec5e8481b6a255b3c3b298
7 years ago
Treehugger Robot
9588da7095
Merge "Revert "Add support for gid derivation on private volumes""
7 years ago
Richard Uhler
32a7b7fe82
Revert "Add support for gid derivation on private volumes"
...
This reverts commit 1b38e33003
.
Causes a boot loop on bullhead.
(cherry picked from commit a3a60b372e
)
Bug: 63245673
Bug: 65660058
Test: m
Merged-In: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
7 years ago
Daniel Rosenberg
d9307f8df7
Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
am: c2c183e02c
...
am: 2c629a9d48
Change-Id: I3479e5656327023526ffbf8c9b973362e4df2321
7 years ago
Daniel Rosenberg
2c629a9d48
Merge "Add support for gid derivation on private volumes" am: 0b7dbf0b1c
...
am: c2c183e02c
Change-Id: I71b1249e1d97bda5dc177881e0d01e3374bcf0a8
7 years ago
Daniel Rosenberg
c2c183e02c
Merge "Add support for gid derivation on private volumes"
...
am: 0b7dbf0b1c
Change-Id: I55313f24f2d932fb76d1b107c9e765b507f0403d
7 years ago
Treehugger Robot
0b7dbf0b1c
Merge "Add support for gid derivation on private volumes"
7 years ago
Daniel Rosenberg
4e8cec1fce
Add support for gid derivation on private volumes
...
This sdcardfs feature was moved under a mount option
and is only needed on private volumes
Test: Private emulated volume should attempt to mount with
derive_gid option.
Bug: 63245673
Change-Id: I40a8b15c298c815a4643007b9eca8269379fd2ac
7 years ago
Rom Lemarchand
29e8bb5df1
Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
...
am: d4af166db8
Change-Id: Iadec8e0e5edec0a61d15d46dd85e0ec7253da62a
7 years ago
TreeHugger Robot
d4af166db8
Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
7 years ago