Andrey Kulikov
cac8b13023
Merge "Remove dependency on libparcelfiledescriptor"
6 years ago
Michael Wright
ad232d6f84
Remove dependency on libparcelfiledescriptor
...
This library doesn't actually exist outside of ARC specific branches,
so it will break any ARC product builds.
Test: None
Change-Id: Ic73f470c93ea7d3590dc2b273624988291612344
6 years ago
Xin Li
925b0cf764
Merge pie-platform-release (PPRL.181105.017, history only) into master
...
Bug: 118454372
Change-Id: Ibc7ddf231ff61272439b9a621490acaff27ce563
6 years ago
TreeHugger Robot
3df6891719
Merge "Revert "Revert "Revert "Revert "vold now prepares a subdirectory for face data."""""
6 years ago
Risan
9b9f00a3e7
[automerger skipped] Merge "ARC++ swap for AppFuseUtil" am: e7a9d5fbbd
am: 5c6aaa3498
...
am: 41672dc992
-s ours
Change-Id: Ie103a2efa58f49ef90c84ef97db20332677fd859
6 years ago
Risan
41672dc992
Merge "ARC++ swap for AppFuseUtil" am: e7a9d5fbbd
...
am: 5c6aaa3498
Change-Id: Iae3bea0197ca2e42aa4e46558f008ea3b19a28ca
6 years ago
Risan
5c6aaa3498
Merge "ARC++ swap for AppFuseUtil"
...
am: e7a9d5fbbd
Change-Id: I50df9e5cc7812d2dee248acc360e0f5840b6a2fc
6 years ago
Treehugger Robot
e7a9d5fbbd
Merge "ARC++ swap for AppFuseUtil"
6 years ago
TreeHugger Robot
ffba5ffec1
Merge "ARC++ swap for AppFuseUtil"
6 years ago
Bowgo Tsai
c16e09197b
Merge "Includes new static libfs_avb" am: 13755d81be
am: 944194715d
...
am: 2c0edb55c0
Change-Id: I62288482fb2d9880c9e8dc5238bb06162a18df7c
6 years ago
Risan
1271b90560
Merge "Extract AppFuse as a util" am: 7be8a7ee1d
am: d04a16cbd5
...
am: 9f7af4b6e3
Change-Id: I92a3fa8828e983df876d42637913737e2b31fd4f
6 years ago
Bowgo Tsai
2c0edb55c0
Merge "Includes new static libfs_avb" am: 13755d81be
...
am: 944194715d
Change-Id: If0fce135eabe1923ab2cd0dde81e792c4ddf81c2
6 years ago
Risan
9f7af4b6e3
Merge "Extract AppFuse as a util" am: 7be8a7ee1d
...
am: d04a16cbd5
Change-Id: Ib42c6c546e65ba3d16f489dd86b6849104d73261
6 years ago
Bowgo Tsai
944194715d
Merge "Includes new static libfs_avb"
...
am: 13755d81be
Change-Id: I32582a4e196582140f6b40a46cf0761994c8a56a
6 years ago
Risan
d04a16cbd5
Merge "Extract AppFuse as a util"
...
am: 7be8a7ee1d
Change-Id: I4000729595b7799498c70fc37639ef652e9a389d
6 years ago
Treehugger Robot
13755d81be
Merge "Includes new static libfs_avb"
6 years ago
Treehugger Robot
7be8a7ee1d
Merge "Extract AppFuse as a util"
6 years ago
TreeHugger Robot
5c801225e4
Merge "Change AppFuse mount location to vold namespace"
6 years ago
Bowgo Tsai
549fd0e9ae
Includes new static libfs_avb
...
Bug: 112103720
Test: boot crosshatch_mainline-userdebug
Change-Id: If33f6dbf7a31d57f61c0aca0296f2ff06c8b4a86
6 years ago
Bill Yi
e101e8712e
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: I090e55f0f34ff556118caaecbb21169580c66ab6
6 years ago
LongPing.WEI
60f121b389
Merge "Use setmntent with "e" option" am: 396040ca2c
am: a92bdeb7f5
...
am: 2255cf528f
Change-Id: Ibc84f3b9d2dc8ab0707b354d64529434355f36d6
6 years ago
LongPing.WEI
2255cf528f
Merge "Use setmntent with "e" option" am: 396040ca2c
...
am: a92bdeb7f5
Change-Id: I269ba8a35f5441e78c6d7945ce4726eae3e33cdd
6 years ago
LongPing.WEI
a92bdeb7f5
Merge "Use setmntent with "e" option"
...
am: 396040ca2c
Change-Id: I4ccb2a328f1203ab1fc9d5c58d89551f737d58b6
6 years ago
Treehugger Robot
396040ca2c
Merge "Use setmntent with "e" option"
6 years ago
Risan
8f6198d299
Change AppFuse mount location to vold namespace
...
Previously, AppFuse is mounted in system_server's mount namespace. This
CL moves the mount location to vold namespace.
Relanding this since it fails to be merged on ag/5521004 (blocked by
Presubmit, seems to be caused by temporary state) - this one now
passes presubmit without any changes.
Bug: 110379912
Test: testOpenProxyFileDescriptor passes
Change-Id: Id93c26d5a98842c78f27850c83e15df619cec1ab
6 years ago
LongPing.WEI
4f04606811
Use setmntent with "e" option
...
Otherwise it will cause selinux warning in children processes sometimes
Change-Id: I41239c3f9779140622076c644a5f63051d00eaa8
6 years ago
Daniel Rosenberg
6a1c15cf5b
Merge "Fix error reporting in cp_commitChanges" am: 2a683d4ce6
am: b0b31d360d
...
am: bc03daec62
Change-Id: I5f223c94f436e33c74272f0364e11697f3b7838e
6 years ago
Daniel Rosenberg
bc03daec62
Merge "Fix error reporting in cp_commitChanges" am: 2a683d4ce6
...
am: b0b31d360d
Change-Id: I71ba57abf41afaae7b9f08ed4490fb2c08b5dfe4
6 years ago
Daniel Rosenberg
b0b31d360d
Merge "Fix error reporting in cp_commitChanges"
...
am: 2a683d4ce6
Change-Id: Ie997ca2fac3a6cd8421fdae6617e016b4533486f
6 years ago
Daniel Rosenberg
2a683d4ce6
Merge "Fix error reporting in cp_commitChanges"
6 years ago
Kevin Chyn
cdd4228eeb
Revert "Revert "Revert "Revert "vold now prepares a subdirectory for face data.""""
...
Bug: 116528212
This reverts commit 8973e2d5d0
.
Reason for revert: Will submit after selinux issues are resolved
Change-Id: Ie2df91b33be70629e8c08fdbcc6e7ad0faea13a9
6 years ago
Daniel Rosenberg
4b86df1426
Fix error reporting in cp_commitChanges
...
Only trys to commit if necessary, and reports errors
if commiting fails. RemoveFileIfExists returns true on
success.
Test: vdc checkpoint startCheckpoint, reboot, and then
vdc checkpoint commitChanges
Bug: 111020314
Change-Id: Ie1b3e49beb3ca04f2881fcc595882c607368b477
6 years ago
TreeHugger Robot
3abbde0027
Merge "Revert "Revert "Revert "vold now prepares a subdirectory for face data.""""
6 years ago
Nick Kralevich
8973e2d5d0
Revert "Revert "Revert "vold now prepares a subdirectory for face data."""
...
This reverts commit 9dcf54929f
.
Reason for revert: Device fails to boot after OTA.
Bug: 116528212
Bug: 119747564
Change-Id: I32bfbc2c2fd560f090e078426315111f241e76cf
6 years ago
Kevin Chyn
7e6560402b
Merge "Revert "Revert "vold now prepares a subdirectory for face data."""
6 years ago
Kevin Chyn
9dcf54929f
Revert "Revert "vold now prepares a subdirectory for face data.""
...
This reverts commit a70d237a05
.
Reason for revert: Submitting together or after SELinux policy is in place
Change-Id: I952f94df99496ced04adba1ec28d42be53202982
6 years ago
Kevin Chyn
5792935a8e
Merge "Revert "vold now prepares a subdirectory for face data.""
6 years ago
Kevin Chyn
a70d237a05
Revert "vold now prepares a subdirectory for face data."
...
This reverts commit 21b3b37af3
.
Reason for revert: device not booting
Change-Id: Ia76b8454268d70dcd9d9f1ad0d291aaec63b3fd4
6 years ago
Jie
ef733754e7
Merge "Add fsync for renaming user ce key path" am: 622585b11b
am: c26ff35858
...
am: fd2eabf1e6
Change-Id: I89cc0d8bc3ddaf757c6d4704d7097662a5fbda8c
6 years ago
Jie
fd2eabf1e6
Merge "Add fsync for renaming user ce key path" am: 622585b11b
...
am: c26ff35858
Change-Id: Ia569027d46e853adeb868f5c4bd83b4619452c61
6 years ago
Jie
c26ff35858
Merge "Add fsync for renaming user ce key path"
...
am: 622585b11b
Change-Id: Ic110b6725790398a235d0766330b0899ab52bedb
6 years ago
Treehugger Robot
622585b11b
Merge "Add fsync for renaming user ce key path"
6 years ago
Kevin Chyn
cb7fd49601
Merge "vold now prepares a subdirectory for face data."
6 years ago
Ben Murdoch
0a0cda395b
Merge changes from topics "appfuse-revert", "appfuse"
...
* changes:
Revert "Change AppFuse mount location to vold namespace"
Merge commit 'c4381df50a0f226a60a63c786f57ed74e9c4fc6b' into manual_merge_c4381df50a0f226a60a63c786f57ed74e9c4fc6b
6 years ago
Jie
b6698d56ac
Add fsync for renaming user ce key path
...
Device can't start up after the following steps:
1. set screen lock to PIN/Pattern/Password
2. set screen lock to Swipe/None
3. power down immediately after pressing "YES, REMOVE"
4. reboot
failed log:
Failed to read from /data/misc/vold/user_keys/ce/0/current/keymaster_key_blob
root cause:
flushing data failed because of power down
issue:
https://partnerissuetracker.corp.google.com/u/1/issues/119382750
6 years ago
Risan
e9f7bc3e20
Revert "Change AppFuse mount location to vold namespace"
...
This reverts commit 5f53cd3b79
.
Test: Presubmit
Change-Id: Ib2b349018c9e57cb7f5e6f755dcf8f97e9b2f255
6 years ago
Sudheer Shanka
105fd6ff0f
Merge "Update shared sandbox prefix to "shared-"."
6 years ago
Risan
7c7d05f1c9
Merge commit 'c4381df50a0f226a60a63c786f57ed74e9c4fc6b' into manual_merge_c4381df50a0f226a60a63c786f57ed74e9c4fc6b
...
Test: presubmit
Change-Id: I031fbde20b8e66e7ef1255a1ff3a3c15644070f9
6 years ago
Risan
c4381df50a
Merge "Change AppFuse mount location to vold namespace" am: b2455747a9
...
am: 996963c938
Change-Id: I416009aac32118613ffdade06280a1a848e9ec18
6 years ago
Risan
996963c938
Merge "Change AppFuse mount location to vold namespace"
...
am: b2455747a9
Change-Id: I59cb49859d9622dd460e61e1b55220dd04585ad5
6 years ago