Treehugger Robot
da85cb71b3
Merge "add vold to "shutdown critical""
7 years ago
Keun-young Park
41156c5035
add vold to "shutdown critical"
...
bug: 37626581
Test: reboot and check last kmsg
Change-Id: I2c186c20a4afc342eaae420175013c80219a5ee5
7 years ago
Paul Crowley
071120776a
resolve merge conflicts of 8e6f6a5
to oc-dr1-dev-plus-aosp
...
Test: None
Change-Id: Icf7654b3200a4afd104f31aff8ce5b09867b7182
7 years ago
Paul Crowley
8e6f6a5ceb
resolve merge conflicts of 4ad7784
to stage-aosp-master
...
am: ddb542f574
Change-Id: Iedef223a14b8a0c8dc558440b429a33d6b23f948
7 years ago
Paul Crowley
ddb542f574
resolve merge conflicts of 4ad7784
to stage-aosp-master
...
Test: Build seems to be unrelatedly broken
Change-Id: I2df307aa1c7134f217c558495e1438412480f324
Merged-In: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
7 years ago
Treehugger Robot
4ad7784b07
Merge "Label keys with all the possible FBE prefixes that might apply"
7 years ago
Paul Crowley
ab4cc7814f
Label keys with all the possible FBE prefixes that might apply
...
We don't know which FS and kernel version is going to want these keys,
so put them in the kernel three times with all three possible prefixes.
Bug: 62900873
Test: Marlin set up before this change successfully boots after it.
Change-Id: I6ccfe0894551ba068de9bf5e23fe4fd1e10e36b1
7 years ago
Tom Cherry
bd40570e25
Merge "Use WaitForProperty() to wait for restorecon" am: 963a205a1b
am: 80ce34d6cb
...
am: dfd0492354
Change-Id: Id3b68e5b946fc1bf886f59e59fee3960a2899041
7 years ago
Tom Cherry
dfd0492354
Merge "Use WaitForProperty() to wait for restorecon" am: 963a205a1b
...
am: 80ce34d6cb
Change-Id: I4687810672b51db024f11ad7976562d510de9b81
7 years ago
Tom Cherry
80ce34d6cb
Merge "Use WaitForProperty() to wait for restorecon"
...
am: 963a205a1b
Change-Id: I4a11f21c0849922cda49e3f771a0b0dcfc5a3177
7 years ago
Treehugger Robot
963a205a1b
Merge "Use WaitForProperty() to wait for restorecon"
7 years ago
Tom Cherry
d6127ef795
Use WaitForProperty() to wait for restorecon
...
We have android::base::WaitForProperty() that uses futexes to
efficiently wait for property value changes, so use that instead
polling.
Test: Boot bullhead
Change-Id: Id964eddbdbfd9b5ceac5ed83a8ed66b9e60008ca
7 years ago
Chih-Hung Hsieh
b413703a3b
Merge "Add OWNERS in system/vold" am: f18a5aad56
am: db09dbafdd
...
am: c8240e2dd3
Change-Id: Ie400e5a087a11670ea2f46b2056dd9a659d01317
7 years ago
Chih-Hung Hsieh
c8240e2dd3
Merge "Add OWNERS in system/vold" am: f18a5aad56
...
am: db09dbafdd
Change-Id: I78c4e90025a9b2785fff5955a5ece7bc5e866bd0
7 years ago
Chih-Hung Hsieh
db09dbafdd
Merge "Add OWNERS in system/vold"
...
am: f18a5aad56
Change-Id: I75b04fc9a4e8d2e5de49833893ba74a375130929
7 years ago
Treehugger Robot
f18a5aad56
Merge "Add OWNERS in system/vold"
7 years ago
Chih-Hung Hsieh
978b7cfc0e
Add OWNERS in system/vold
...
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I4d0431105b55e88be258800a7fd45a42deb9bb60
7 years ago
Elliott Hughes
e4775fdbca
Merge "vold should #include <sys/sysmacros.h>" am: 398c0e8274
am: 208b464f72
am: fb3e85cf99
...
am: 048422d46e
Change-Id: I33406265fcf0c77a6289cb429aa6a2cc5e8f7146
7 years ago
Elliott Hughes
048422d46e
Merge "vold should #include <sys/sysmacros.h>" am: 398c0e8274
am: 208b464f72
...
am: fb3e85cf99
Change-Id: I32ed2a66bb60ba1042737b4bbb0a2195a3fe8e6f
7 years ago
Elliott Hughes
fb3e85cf99
Merge "vold should #include <sys/sysmacros.h>" am: 398c0e8274
...
am: 208b464f72
Change-Id: I8d4a8069958bc4af67766fde101c322b2f189049
7 years ago
Elliott Hughes
208b464f72
Merge "vold should #include <sys/sysmacros.h>"
...
am: 398c0e8274
Change-Id: Id72168cac260fedc3123e28402f737ee8be3f625
7 years ago
Treehugger Robot
398c0e8274
Merge "vold should #include <sys/sysmacros.h>"
7 years ago
Elliott Hughes
0e08e84df0
vold should #include <sys/sysmacros.h>
...
Bug: https://github.com/android-ndk/ndk/issues/398
Test: builds
Change-Id: I7a1ca1701099886fb493cc5288d6ee867d5f520a
7 years ago
Rubin Xu
2cd0b938cb
Add secdiscard command for secure deletion of files am: f8d604caf3
...
am: f572398ae6
-s ours
Change-Id: Ic9960602cac03407caa8f63e4f0c9913640db5d2
7 years ago
Rubin Xu
f572398ae6
Add secdiscard command for secure deletion of files
...
am: f8d604caf3
Change-Id: Ib9d71507b880ee8dc66880536c800212f523332d
7 years ago
Rubin Xu
f8d604caf3
Add secdiscard command for secure deletion of files
...
This is used by LockSettingsService to delete sensitive credential files.
Bug: 34600579
Test: manual - change device lock under synthetic password, verify
old data on disk is erased.
Change-Id: I5e11b559ad8818bd2ad2b321d67d21477aab7555
Merged-In: I5e11b559ad8818bd2ad2b321d67d21477aab7555
7 years ago
Rubin Xu
2436e27717
Add secdiscard command for secure deletion of files
...
This is used by LockSettingsService to delete sensitive credential files.
Bug: 34600579
Test: manual - change device lock under synthetic password, verify
old data on disk is erased.
Change-Id: I5e11b559ad8818bd2ad2b321d67d21477aab7555
7 years ago
Elliott Hughes
e437bad807
Merge "Switch to libkeyutils." am: 612eea6b4f
am: 7a7df78819
am: f727d05b83
...
am: 4e19ff7ab1
Change-Id: Iff35b18579b3f7e932d36ed2164fd49b7791f779
7 years ago
Elliott Hughes
4e19ff7ab1
Merge "Switch to libkeyutils." am: 612eea6b4f
am: 7a7df78819
...
am: f727d05b83
Change-Id: I1b3e4e932e54b33dd582a849135822ace61c11d7
7 years ago
Elliott Hughes
f727d05b83
Merge "Switch to libkeyutils." am: 612eea6b4f
...
am: 7a7df78819
Change-Id: I05f95589668e93b36d5d5eed2c4ac21aff6f7e41
7 years ago
Elliott Hughes
7a7df78819
Merge "Switch to libkeyutils."
...
am: 612eea6b4f
Change-Id: Icb86bc1c341ec9366f382985522b6ec70e11b8ea
7 years ago
Elliott Hughes
612eea6b4f
Merge "Switch to libkeyutils."
7 years ago
Elliott Hughes
9baffc8ed4
Merge "Switch to libkeyutils."
7 years ago
TreeHugger Robot
965278233d
Merge "Add CryptfsScryptHidlizationEquivalenceTest"
7 years ago
Elliott Hughes
c3bda18bda
Switch to libkeyutils.
...
Bug: http://b/37991155
Test: builds+boots
Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b
7 years ago
Elliott Hughes
12d1312f98
Switch to libkeyutils.
...
Bug: http://b/37991155
Test: builds+boots
Change-Id: I33a3ba0d59ffd504093dc94517815c1196e95e2b
7 years ago
Tom Cherry
805defa9b4
Merge "BuildDataUserCePath always use dir instead of symbolic link" am: fed8ab1d76
am: 7dc93304c8
am: 10211d2207
...
am: 3559234cd3
Change-Id: Ifc6196804b57bdf9d38a37d594281ef53623f0d3
7 years ago
Tom Cherry
3559234cd3
Merge "BuildDataUserCePath always use dir instead of symbolic link" am: fed8ab1d76
am: 7dc93304c8
...
am: 10211d2207
Change-Id: I8ab5875455abaaa84cc777a96be23cbad314d3f7
7 years ago
Tom Cherry
10211d2207
Merge "BuildDataUserCePath always use dir instead of symbolic link" am: fed8ab1d76
...
am: 7dc93304c8
Change-Id: I025e83bc54bcda6e1a947301479bdd79d5a17e7b
7 years ago
Tom Cherry
7dc93304c8
Merge "BuildDataUserCePath always use dir instead of symbolic link"
...
am: fed8ab1d76
Change-Id: I98b7b11905f94c6576c268cfe950ed092b5e74d8
7 years ago
Tom Cherry
fed8ab1d76
Merge "BuildDataUserCePath always use dir instead of symbolic link"
7 years ago
Steven Moreland
a904d42a53
Keymaster: IWYU
...
am: 8264033678
Change-Id: Ia58e5508a19c4ba516a840e5f5287bfa1cb31bd1
7 years ago
Steven Moreland
8264033678
Keymaster: IWYU
...
Was depending on this transitively from MQDescriptor.h
Test: links
Bug: 37791060
Change-Id: I9b52bbe9ac6c3a54fdb6e352e90eba50914633d4
(cherry picked from commit 25e8b4b4f6
)
7 years ago
Steven Moreland
25e8b4b4f6
Keymaster: IWYU
...
Was depending on this transitively from MQDescriptor.h
Test: links
Bug: 37791060
Change-Id: I9b52bbe9ac6c3a54fdb6e352e90eba50914633d4
7 years ago
Daniel Rosenberg
0411327894
Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev am: c40996e719
...
am: 0066d41edd
-s ours
Change-Id: Ic762430d6e04de38d0cc08846774d2e7604eaf41
7 years ago
Daniel Rosenberg
0066d41edd
Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev
...
am: c40996e719
Change-Id: If30418cbb9af2e9d81b944474483c8040845c12d
7 years ago
TreeHugger Robot
c40996e719
Merge "Revert "Revert "Stop dropping caches now we have kernel fix""" into oc-dev
7 years ago
TreeHugger Robot
f3adadf974
Merge "Revert "Revert "Stop dropping caches now we have kernel fix"""
7 years ago
Guang Zhu
ea43a7e4ea
Merge "Revert "Enable metadata encryption""
7 years ago
Guang Zhu
5b6c6a2c4a
Revert "Enable metadata encryption"
...
Bug: 37792477
This reverts commit 3963b23645
.
Change-Id: I3b6bf5a9a4c3899aabe2c824d8498a06981daed8
7 years ago