OSDN Git Service
Jeff Sharkey [Fri, 12 Jan 2018 20:20:15 +0000 (20:20 +0000)]
Merge "Remove FIDTRIM."
Jeff Sharkey [Fri, 12 Jan 2018 17:42:13 +0000 (10:42 -0700)]
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
Chih-hung Hsieh [Mon, 11 Dec 2017 23:22:58 +0000 (23:22 +0000)]
Merge "Fix warning in system/vold/tests."
Chih-Hung Hsieh [Thu, 7 Dec 2017 22:18:34 +0000 (14:18 -0800)]
Fix warning in system/vold/tests.
* Comment out unused function.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I18db09be2ff8ef27f822876a6832ca5f08ce939f
Merged-In: I7a23573af0d664a5f39f1cde3a22ac0001dac1ac
Xin Li [Wed, 6 Dec 2017 23:18:28 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:23 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: Ic7e2e2d1ef7bf17a9c81ea30d759fd9fe0a218c7
Pierre-Hugues Husson [Tue, 28 Nov 2017 18:59:56 +0000 (18:59 +0000)]
Merge "Workaround perdev_minors path change in Linux"
am:
d3870c5167
Change-Id: Ia7ec03a566f8c122dff05bcc3d996c05cf2b7771
Treehugger Robot [Tue, 28 Nov 2017 18:45:30 +0000 (18:45 +0000)]
Merge "Workaround perdev_minors path change in Linux"
Pierre-Hugues Husson [Tue, 28 Nov 2017 14:42:56 +0000 (15:42 +0100)]
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
Paul Crowley [Mon, 27 Nov 2017 20:59:33 +0000 (20:59 +0000)]
Merge "Key upgrading for FDE."
am:
997e605563
Change-Id: If2ca4a6bd3b7a2b36b6c092975bcfdde8e063a3e
Treehugger Robot [Mon, 27 Nov 2017 20:55:51 +0000 (20:55 +0000)]
Merge "Key upgrading for FDE."
Paul Crowley [Tue, 21 Nov 2017 23:43:51 +0000 (15:43 -0800)]
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
Xin Li [Tue, 14 Nov 2017 20:20:56 +0000 (12:20 -0800)]
Merge commit '
e2d1d99f1a98b02a28fe71f2a387a72b69d4b4a6' from
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: I4bdada4c933109f1cc60c61946fa30e174ca7583
Jaegeuk Kim [Tue, 14 Nov 2017 01:10:34 +0000 (01:10 +0000)]
Merge "cryptfs: support make_f2fs with quota"
am:
7807866abe
Change-Id: I9b52d87df0a6ddc3c29b4bd5d302e300747ad4c1
Jaegeuk Kim [Tue, 14 Nov 2017 01:10:17 +0000 (01:10 +0000)]
Merge "cryptfs: call format_f2fs correctly with proper flags"
am:
b9a1169eca
Change-Id: I7ad4229ee514d80fc3280d8f468844a3b5eb9137
Treehugger Robot [Tue, 14 Nov 2017 01:06:37 +0000 (01:06 +0000)]
Merge "cryptfs: support make_f2fs with quota"
Jaegeuk Kim [Tue, 14 Nov 2017 01:06:27 +0000 (01:06 +0000)]
Merge "cryptfs: call format_f2fs correctly with proper flags"
Jaegeuk Kim [Wed, 1 Nov 2017 17:35:30 +0000 (10:35 -0700)]
cryptfs: support make_f2fs with quota
Change-Id: I699b457ca0282c02e0d0a399c146d4e54a403bf4
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Jaegeuk Kim [Mon, 5 Jun 2017 17:22:04 +0000 (10:22 -0700)]
cryptfs: call format_f2fs correctly with proper flags
Change-Id: Ia493e6f758ff5dd5dd41479193ab237d4306d464
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Jeff Vander Stoep [Tue, 24 Oct 2017 17:19:58 +0000 (17:19 +0000)]
Merge "Check that dir name is a pid before attempting to read"
am:
6419445383
Change-Id: I8b7639934bcee660bcd84f83afae5cc2c17bae15
Treehugger Robot [Tue, 24 Oct 2017 17:15:03 +0000 (17:15 +0000)]
Merge "Check that dir name is a pid before attempting to read"
Jeff Vander Stoep [Tue, 24 Oct 2017 00:12:31 +0000 (17:12 -0700)]
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
Chih-hung Hsieh [Thu, 19 Oct 2017 23:18:12 +0000 (23:18 +0000)]
Merge "Use -Werror in system/vold/tests"
am:
d6d0e91c62
Change-Id: Idc41239ba5d67954dfb7d6e61e31768dafdd3599
Chih-hung Hsieh [Thu, 19 Oct 2017 22:33:52 +0000 (22:33 +0000)]
Merge "Use -Werror in system/vold/tests"
Chih-Hung Hsieh [Wed, 18 Oct 2017 23:15:49 +0000 (16:15 -0700)]
Use -Werror in system/vold/tests
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: Ied1f6160124d10d81151d401ed4a0b089816abb3
Paul Crowley [Wed, 4 Oct 2017 05:29:30 +0000 (05:29 +0000)]
Merge "Remove CheckBattery altogether" into stage-aosp-master am:
db436c7999
am:
45aa0f6c51
Change-Id: I91e0b067e313869417b8b18d9f65f8d0f2acc894
Paul Crowley [Wed, 4 Oct 2017 05:27:10 +0000 (05:27 +0000)]
Merge "Remove CheckBattery altogether" into stage-aosp-master
am:
db436c7999
Change-Id: I65e49db994bbfe266772fa36ed97bee4e4468d5b
TreeHugger Robot [Wed, 4 Oct 2017 05:22:11 +0000 (05:22 +0000)]
Merge "Remove CheckBattery altogether" into stage-aosp-master
Paul Crowley [Wed, 4 Oct 2017 04:43:55 +0000 (04:43 +0000)]
Merge "Remove CheckBattery altogether" am:
2890b8d215 -s ours am:
90a9c44f9d
am:
68b565336b
Change-Id: I88aa538f2bfb210ce185784ee2c95b70080718e4
Paul Crowley [Wed, 4 Oct 2017 04:41:42 +0000 (04:41 +0000)]
Merge "Remove CheckBattery altogether" am:
2890b8d215 -s ours
am:
90a9c44f9d
Change-Id: Ie6d021923c2fe396d954b4df07eb293a9cf3dd6d
Paul Crowley [Wed, 4 Oct 2017 04:39:22 +0000 (04:39 +0000)]
Merge "Remove CheckBattery altogether"
am:
2890b8d215 -s ours
Change-Id: I3ad2174feea5d62b9bcff2119032abd80254d77c
Paul Crowley [Mon, 2 Oct 2017 23:18:56 +0000 (16:18 -0700)]
Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug:
16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
Treehugger Robot [Tue, 3 Oct 2017 23:19:02 +0000 (23:19 +0000)]
Merge "Remove CheckBattery altogether"
Paul Crowley [Tue, 3 Oct 2017 22:08:31 +0000 (22:08 +0000)]
Remove CheckBattery altogether
am:
a04014bf26
Change-Id: I7aefe1d6f4815a7f02671869fe940a3cdd13cd70
Paul Crowley [Mon, 2 Oct 2017 23:18:56 +0000 (16:18 -0700)]
Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug:
16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
Paul Crowley [Mon, 2 Oct 2017 23:18:56 +0000 (16:18 -0700)]
Remove CheckBattery altogether
Test: changed Angler fstab to encryptable and encrypted.
Bug:
16868177
Change-Id: I17d36ea838d6d96f0752b2d6d03b1f9a781ed018
Yifan Hong [Thu, 28 Sep 2017 18:32:23 +0000 (18:32 +0000)]
Merge "vold: remove unnecessary dependency on libbatteryservice." am:
7b0ac6d37e am:
2313818c46
am:
a6f34f6e78
Change-Id: I824e6e9285013895bc989e2667e297e130b6e1af
Yifan Hong [Thu, 28 Sep 2017 18:30:01 +0000 (18:30 +0000)]
Merge "vold: remove unnecessary dependency on libbatteryservice." am:
7b0ac6d37e
am:
2313818c46
Change-Id: I1faae4261398a107aee274a7b6a4b05766786257
Yifan Hong [Thu, 28 Sep 2017 18:21:49 +0000 (18:21 +0000)]
Merge "vold: remove unnecessary dependency on libbatteryservice."
am:
7b0ac6d37e
Change-Id: I772e82a8ae54477014076be34b7dab5cb968fba7
Treehugger Robot [Thu, 28 Sep 2017 18:14:42 +0000 (18:14 +0000)]
Merge "vold: remove unnecessary dependency on libbatteryservice."
Yifan Hong [Tue, 26 Sep 2017 21:27:24 +0000 (14:27 -0700)]
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
Rom Lemarchand [Fri, 15 Sep 2017 18:48:01 +0000 (18:48 +0000)]
Revert "Revert "Add support for gid derivation on private volumes""
This reverts commit
a3a60b372efb48a672848c7797efd57a4ec92303.
Reason for revert: All kernel prebuilts merged
(cherry picked from commit
75ae529bf86c33106e6a716ad054c6eea6deabc5)
Bug:
65600849
Bug:
65573871
Test: m
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
Richard Uhler [Fri, 22 Sep 2017 17:32:02 +0000 (17:32 +0000)]
Merge "Revert "Add support for gid derivation on private volumes"" am:
9588da7095 am:
6b264e4a4c
am:
3ed63e8d21
Change-Id: Ie3abbe2dee226330576e42b44910652ff272eb74
Richard Uhler [Fri, 22 Sep 2017 17:30:00 +0000 (17:30 +0000)]
Merge "Revert "Add support for gid derivation on private volumes"" am:
9588da7095
am:
6b264e4a4c
Change-Id: Ic617080e8f98079bd3075621dc85f5dfa00ff5ba
Richard Uhler [Fri, 22 Sep 2017 17:24:03 +0000 (17:24 +0000)]
Merge "Revert "Add support for gid derivation on private volumes""
am:
9588da7095
Change-Id: Ie2e32cca7542cdc1aaec5e8481b6a255b3c3b298
Treehugger Robot [Fri, 22 Sep 2017 17:21:55 +0000 (17:21 +0000)]
Merge "Revert "Add support for gid derivation on private volumes""
Richard Uhler [Thu, 14 Sep 2017 14:51:04 +0000 (14:51 +0000)]
Revert "Add support for gid derivation on private volumes"
This reverts commit
1b38e330035833971663eeb5bccfa16e4ffc1e72.
Causes a boot loop on bullhead.
(cherry picked from commit
a3a60b372efb48a672848c7797efd57a4ec92303)
Bug:
63245673
Bug:
65660058
Test: m
Merged-In: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Daniel Rosenberg [Thu, 21 Sep 2017 01:07:43 +0000 (01:07 +0000)]
Merge "Add support for gid derivation on private volumes" am:
0b7dbf0b1c am:
c2c183e02c
am:
2c629a9d48
Change-Id: I3479e5656327023526ffbf8c9b973362e4df2321
Daniel Rosenberg [Thu, 21 Sep 2017 01:05:14 +0000 (01:05 +0000)]
Merge "Add support for gid derivation on private volumes" am:
0b7dbf0b1c
am:
c2c183e02c
Change-Id: I71b1249e1d97bda5dc177881e0d01e3374bcf0a8
Daniel Rosenberg [Thu, 21 Sep 2017 01:03:16 +0000 (01:03 +0000)]
Merge "Add support for gid derivation on private volumes"
am:
0b7dbf0b1c
Change-Id: I55313f24f2d932fb76d1b107c9e765b507f0403d
Treehugger Robot [Thu, 21 Sep 2017 00:57:48 +0000 (00:57 +0000)]
Merge "Add support for gid derivation on private volumes"
Daniel Rosenberg [Wed, 6 Sep 2017 22:25:40 +0000 (15:25 -0700)]
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
Rom Lemarchand [Fri, 15 Sep 2017 22:02:59 +0000 (22:02 +0000)]
Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
am:
d4af166db8
Change-Id: Iadec8e0e5edec0a61d15d46dd85e0ec7253da62a
TreeHugger Robot [Fri, 15 Sep 2017 21:59:32 +0000 (21:59 +0000)]
Merge "Revert "Revert "Add support for gid derivation on private volumes""" into oc-mr1-dev
Rom Lemarchand [Fri, 15 Sep 2017 18:48:01 +0000 (18:48 +0000)]
Revert "Revert "Add support for gid derivation on private volumes""
This reverts commit
a3a60b372efb48a672848c7797efd57a4ec92303.
Reason for revert: All kernel prebuilts merged
Bug:
65600849
Bug:
65573871
Change-Id: I75b0cb1d82213b875cbef8d39f4f1a8fb34b9795
Richard Uhler [Thu, 14 Sep 2017 15:41:02 +0000 (15:41 +0000)]
Merge "Revert "Add support for gid derivation on private volumes"" into oc-mr1-dev
am:
3bfa263f53
Change-Id: Ib9b44d214fbe6822da18ed4f4cc850c0314426b5
Daniel Rosenberg [Thu, 14 Sep 2017 15:39:50 +0000 (15:39 +0000)]
Merge "Add support for gid derivation on private volumes" into oc-mr1-dev
am:
e335ee8f72
Change-Id: I4546ead188fc1e8fc675153586b1c4b4500f9c72
Richard Uhler [Thu, 14 Sep 2017 14:55:32 +0000 (14:55 +0000)]
Merge "Revert "Add support for gid derivation on private volumes"" into oc-mr1-dev
Richard Uhler [Thu, 14 Sep 2017 14:51:04 +0000 (14:51 +0000)]
Revert "Add support for gid derivation on private volumes"
This reverts commit
1b38e330035833971663eeb5bccfa16e4ffc1e72.
Causes a boot loop on bullhead.
Bug:
63245673
Bug:
65660058
Change-Id: I9c8afd3ba22547aff5aff06b71cb8ff3b8a07350
Chen, Luhai [Thu, 14 Sep 2017 03:37:40 +0000 (03:37 +0000)]
Fix keyname generation issue
am:
5744dfe3cc
Change-Id: Iad7a5325249b609720a295473194e40ff1747d4a
TreeHugger Robot [Thu, 14 Sep 2017 01:37:01 +0000 (01:37 +0000)]
Merge "Add support for gid derivation on private volumes" into oc-mr1-dev
Chen, Luhai [Fri, 18 Aug 2017 06:49:45 +0000 (14:49 +0800)]
Fix keyname generation issue
The keyname binded to keyring return a wrong string when there are binary char larger than 127,
the sign extension will introduce unexpect FFFFFF string to the keyname.
Bug:
65423023
Test: local build with boot test and device encryption status check.
Change-Id: I26482c98ac1858a63b9f5c3f84a8699fd6a21cd7
Signed-off-by: Ai, Ting A <ting.a.ai@intel.com>
Signed-off-by: Chen, Luhai <luhai.chen@intel.com>
Daniel Rosenberg [Wed, 6 Sep 2017 22:25:40 +0000 (15:25 -0700)]
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
Luis Hector Chavez [Wed, 6 Sep 2017 19:57:37 +0000 (19:57 +0000)]
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF" am:
a3258252ad am:
2aa4643dca
am:
d896787df7
Change-Id: I3b72e82b030c685d7e11fa00601774eaba3c241c
Luis Hector Chavez [Wed, 6 Sep 2017 19:52:35 +0000 (19:52 +0000)]
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF" am:
a3258252ad
am:
2aa4643dca
Change-Id: I959f84c8e0962ddda76016f4bfa456970bf52be3
Luis Hector Chavez [Wed, 6 Sep 2017 19:48:35 +0000 (19:48 +0000)]
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
am:
a3258252ad
Change-Id: I92981e2eb069c4b01ac8d1be51abddb47602529c
Treehugger Robot [Wed, 6 Sep 2017 19:32:03 +0000 (19:32 +0000)]
Merge "Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF"
Josh Gao [Tue, 29 Aug 2017 22:01:20 +0000 (22:01 +0000)]
Merge "Switch RebootType to an enum class." am:
db725d3348 am:
da54114d23
am:
c01810be33
Change-Id: Ie54bffd0befd917165debfd8d6eff8f9552d6949
Josh Gao [Tue, 29 Aug 2017 21:54:20 +0000 (21:54 +0000)]
Merge "Switch RebootType to an enum class." am:
db725d3348
am:
da54114d23
Change-Id: I36b78d3ece0bef5ebedc3193ba989afdfb97e777
Josh Gao [Tue, 29 Aug 2017 21:47:58 +0000 (21:47 +0000)]
Merge "Switch RebootType to an enum class."
am:
db725d3348
Change-Id: I72431dc56d20cf1acb2443ae3d67300a59e10ad3
Treehugger Robot [Tue, 29 Aug 2017 21:26:39 +0000 (21:26 +0000)]
Merge "Switch RebootType to an enum class."
Luis Hector Chavez [Tue, 29 Aug 2017 17:29:48 +0000 (10:29 -0700)]
Invert the order of SO_RCVBUFFORCE and SO_RCVBUFF
This change swaps the order of SO_RCVBUFFORCE and SO_RCVBUFF, because
the latter is silently capped to sysctl_rmem_max. So, just try
SO_RCVBUFF if the former failed.
Bug:
62417946
Test: Run android in a new user and network namespace, vold does not
abort here.
Change-Id: Iac2ddae6fbb80ba84afe5414eade978cd795ef3c
Josh Gao [Mon, 28 Aug 2017 20:22:55 +0000 (13:22 -0700)]
Switch RebootType to an enum class.
RebootType's shutdown enumerator collides with the shutdown socket
function, which causes problems when <sys/socket.h> gets included
transitively. Switch RebootType into an enum class, to namespace its
enumerators.
Test: treehugger
Change-Id: Ib5e8667df363acb28771430fd43000d381dc8620
Gao Xiang [Fri, 18 Aug 2017 17:59:58 +0000 (17:59 +0000)]
mInternalEmulated could be used after shutdown() called
am:
7056de1b42
Change-Id: I26fd9a89730491f22397e92fb35275504ebcd744
Gao Xiang [Mon, 14 Aug 2017 03:32:13 +0000 (11:32 +0800)]
mInternalEmulated could be used after shutdown() called
It fixes the findvolume() / reset() use-after-free issue after
shutdown called to avoid vold crash.
bug:
64833901
Test: test reboot
Fixes:
a5bbb5e3c13d ("make shutdown safe for double calls.")
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
(cherry picked from commit
d263da88076f5299e6202f8b388eab79f6fdd495)
Change-Id: I636b28f30fb82e4672d88144cd04072d24ef3b85
Keun-young Park [Thu, 17 Aug 2017 22:23:40 +0000 (22:23 +0000)]
Merge "mInternalEmulated could be used after shutdown() called" am:
9b4a443bd6 am:
92052aa582 am:
1b6d8237f2
am:
23b87ecf41
Change-Id: I2aeed83fad9d3690c12e5e7a4603697f3a06119b
Keun-young Park [Thu, 17 Aug 2017 22:21:40 +0000 (22:21 +0000)]
Merge "mInternalEmulated could be used after shutdown() called" am:
9b4a443bd6 am:
92052aa582
am:
1b6d8237f2
Change-Id: I71b1ec275e2850c1a8273ac5eebc7373a0729552
Keun-young Park [Thu, 17 Aug 2017 22:17:10 +0000 (22:17 +0000)]
Merge "mInternalEmulated could be used after shutdown() called" am:
9b4a443bd6
am:
92052aa582
Change-Id: I7cd336807b1084bb52fcc2d973b2fd8efe5f54c7
Keun-young Park [Thu, 17 Aug 2017 22:13:40 +0000 (22:13 +0000)]
Merge "mInternalEmulated could be used after shutdown() called"
am:
9b4a443bd6
Change-Id: Ia1007988297c39f391b35ad51645556ceeaf0cc6
Keun-young Park [Thu, 17 Aug 2017 22:10:24 +0000 (22:10 +0000)]
Merge "mInternalEmulated could be used after shutdown() called"
Pavel Grafov [Mon, 14 Aug 2017 14:34:13 +0000 (14:34 +0000)]
Zero memory used for encryuption keys.
am:
e2e2d308df
Change-Id: I94d4cec05b76ade916cda42ae0b215f8272d7d51
Gao Xiang [Mon, 14 Aug 2017 03:32:13 +0000 (11:32 +0800)]
mInternalEmulated could be used after shutdown() called
It fixes the findvolume() / reset() use-after-free issue after
shutdown called to avoid vold crash.
Fixes:
a5bbb5e3c13d ("make shutdown safe for double calls.")
Change-Id: I50f216141b20da08549080291091dc5690c00ffe
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Pavel Grafov [Tue, 1 Aug 2017 16:15:53 +0000 (17:15 +0100)]
Zero memory used for encryuption keys.
std::vector with custom zeroing allocator is used instead of
std::string for data that can contain encryption keys.
Bug:
64201177
Test: manually created a managed profile, changed it's credentials
Test: manually upgraded a phone with profile from O to MR1.
Change-Id: Ic31877049f69eba9f8ea64fd99acaaca5a01d3dd
Ravisankar Reddy [Fri, 4 Aug 2017 04:31:19 +0000 (04:31 +0000)]
Merge "Add noatime to vfat and exfat" into oc-mr1-dev
am:
53deec14b8
Change-Id: I72527d88639638f72aca10d59171a520adce0cdf
TreeHugger Robot [Fri, 4 Aug 2017 04:24:57 +0000 (04:24 +0000)]
Merge "Add noatime to vfat and exfat" into oc-mr1-dev
Keun-young Park [Thu, 3 Aug 2017 18:35:05 +0000 (18:35 +0000)]
do not sleep if it is shutting down am:
375ac25773
am:
4460d0e554
Change-Id: I017220c17760d4264359a91395ff834bd01e1394
Keun-young Park [Thu, 3 Aug 2017 18:29:04 +0000 (18:29 +0000)]
do not sleep if it is shutting down am:
375ac25773
am:
612270b598
Change-Id: I3f88d8b0c5c4654ef57c3f9f0c8851a501945866
Keun-young Park [Thu, 3 Aug 2017 18:28:14 +0000 (18:28 +0000)]
do not sleep if it is shutting down
am:
375ac25773
Change-Id: Id0aa75c190b7012f4d329533fcd664341ae8c26b
Keun-young Park [Thu, 3 Aug 2017 18:24:04 +0000 (18:24 +0000)]
do not sleep if it is shutting down
am:
375ac25773
Change-Id: I576040b0068c27b9c7abd880e390841ce80f9906
Pavel Grafov [Thu, 3 Aug 2017 13:09:53 +0000 (13:09 +0000)]
Drop inode and page caches after evicting CE key.
am:
b350ed02d5
Change-Id: I84b60141c240eb03162dacd9a563cbc8bc006cd7
Keun-young Park [Thu, 3 Aug 2017 00:45:48 +0000 (17:45 -0700)]
do not sleep if it is shutting down
- Various sleep(5) for vold shutdown can increase shutdown time a lot.
- If it is shutting down, do not sleep at all. init will take care of
active partitions if not unmounted.
bug:
64143519
Test: reboot and check logs from vold, check if "ShutdownThread: Shutdown wait timed out" happens.
Change-Id: I7cb91427ad2205fe23a054d255caf7ffdfd9f6c3
Elliott Hughes [Wed, 2 Aug 2017 17:45:02 +0000 (17:45 +0000)]
Merge "Move off deprecated readdir_r." am:
1647759651 am:
b60d874f24 am:
984b786b0e
am:
f14b2fdca9
Change-Id: I931b7642976acdab7003acfd837982d613dd8110
Elliott Hughes [Wed, 2 Aug 2017 17:27:29 +0000 (17:27 +0000)]
Merge "Move off deprecated readdir_r." am:
1647759651 am:
b60d874f24
am:
984b786b0e
Change-Id: Ida8d9a0830cf660155d50e5179d9199717ee1720
Elliott Hughes [Wed, 2 Aug 2017 17:22:55 +0000 (17:22 +0000)]
Merge "Move off deprecated readdir_r." am:
1647759651
am:
b60d874f24
Change-Id: Ic4370c02cf1d83281ffadedd9c2e1006d3748cf1
Elliott Hughes [Wed, 2 Aug 2017 17:19:01 +0000 (17:19 +0000)]
Merge "Move off deprecated readdir_r."
am:
1647759651
Change-Id: I4f5a6422eaef6be21d29f5ddc2b98ee53376e6a0
Elliott Hughes [Wed, 2 Aug 2017 17:12:21 +0000 (17:12 +0000)]
Merge "Move off deprecated readdir_r."
Elliott Hughes [Wed, 2 Aug 2017 00:39:44 +0000 (17:39 -0700)]
Move off deprecated readdir_r.
Bug: http://b/
32678321
Test: builds
Change-Id: I2d6e995d5eed3e72e12ce8b8f82a10143a256cd4
Ravisankar Reddy [Mon, 3 Jul 2017 02:25:33 +0000 (11:25 +0900)]
Add noatime to vfat and exfat
testNoAtime is new cts testcase, which verifies all writable
block filesystems are mounted "noatime" toavoid unnecessary
flash churn. So add noatime for vfat.
Bug:
64137815
Test: run cts -m m CtsOsTestCases -t android.os.cts.EnvironmentTest#testNoAtime
Change-Id: I4f42b54ed0d66e09964351da26d0d3bf38d573d6
Pavel Grafov [Thu, 27 Jul 2017 16:34:57 +0000 (17:34 +0100)]
Drop inode and page caches after evicting CE key.
Bug:
63257991
Test: Turning work profile off and attempting to read profile files.
Change-Id: I36f8ae9a8894f88950f50aed4a06645fab7e998b
Jeff Sharkey [Mon, 17 Jul 2017 19:57:18 +0000 (13:57 -0600)]
Only enable quotas when supported by device.
Otherwise we might end up creating ext4 partitions that the device
can't mount.
Bug:
63763609
Test: builds, boots
Exempt-From-Owner-Approval: Bug
63673347
Change-Id: I5f6cf73f23a55bc0dea9480523f19049313c3dd1
OSDN Git Service
