3303 Commits (cf5916f3fa9e5eabc143dfb3669198e9ba3c3634)
 

Author SHA1 Message Date
Paul Crowley c17827b095 Merge changes from topics "fscrypt-options", "fstab-options"
5 years ago
Paul Crowley a50f6c3c2c Use new encryption_options fstab entry
5 years ago
Nikita Ioffe 63af405fc8 [automerger skipped] Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112 am: 536830ac65
5 years ago
Nikita Ioffe 667dadb67a Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112
5 years ago
Nikita Ioffe 536830ac65 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b
5 years ago
Nikita Ioffe 3dbe996112 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
5 years ago
Nikita Ioffe f37dff724b Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
5 years ago
Xin Li c4902f34c0 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours am: a69c584aaa -s ours
5 years ago
Xin Li da152fccb0 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours
5 years ago
Xin Li a69c584aaa [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours
5 years ago
Xin Li c21f19338e [automerger skipped] Merge "Merge Coral/Flame into AOSP master"
5 years ago
Xin Li 387257af36 [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours am: 119618a381 -s ours am: b462c16fb6 -s ours
5 years ago
Xin Li ee393feadc [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours am: 119618a381 -s ours
5 years ago
Xin Li b462c16fb6 [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours
5 years ago
Xin Li 119618a381 [automerger skipped] Merge Coral/Flame into AOSP master
5 years ago
Xin Li be4ff998ac Merge "Merge Coral/Flame into AOSP master"
5 years ago
Nikita Ioffe e1fd48999b Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT
5 years ago
Nikita Ioffe ce2a532c00 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
5 years ago
Nikita Ioffe 5d85bf3127 Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT
5 years ago
Paul Crowley 3941682cf3 Merge "Use new C++ libfscrypt interface." am: 7e43d985cf am: e96e670746 am: d1823f16c8
5 years ago
Paul Crowley 9572a9fcdc Merge "Use new C++ libfscrypt interface." am: 7e43d985cf am: e96e670746
5 years ago
Paul Crowley d1823f16c8 Merge "Use new C++ libfscrypt interface." am: 7e43d985cf
5 years ago
Paul Crowley e96e670746 Merge "Use new C++ libfscrypt interface."
5 years ago
Paul Crowley 7e43d985cf Merge "Use new C++ libfscrypt interface."
5 years ago
Xin Li 8a9454c35c Merge Coral/Flame into AOSP master
5 years ago
Paul Crowley f612b8b5ab Replace "flags" property with "options" with same format as fstab
5 years ago
Paul Crowley 5e53ff6e8f Use new C++ libfscrypt interface.
5 years ago
Xin Li 276489bbca Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: e9679eaa46 am: dd369ccddf
5 years ago
Xin Li fb9bf0fb6a Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: e9679eaa46
5 years ago
Xin Li dd369ccddf Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
5 years ago
TreeHugger Robot e9679eaa46 Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
5 years ago
Paul Lawrence 592cf7a16d Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d am: a2c2182b65 am: 0496f970a3
5 years ago
Paul Lawrence 042a67afa1 Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d am: a2c2182b65
5 years ago
Paul Lawrence 0496f970a3 Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d
5 years ago
Paul Lawrence a2c2182b65 Merge "Make sure CtsCheckpointTestCases passes"
5 years ago
Treehugger Robot 21799c8f7d Merge "Make sure CtsCheckpointTestCases passes"
5 years ago
Paul Lawrence 4c757fb6cc Make sure CtsCheckpointTestCases passes
5 years ago
Nikita Ioffe 7a04dfe86d Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 am: e182b26d64 am: 3631ac59fd
5 years ago
Nikita Ioffe 3ec81f1059 Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 am: e182b26d64
5 years ago
Nikita Ioffe 3631ac59fd Merge "vold: implement resetCheckpoint" am: 4eeebff8d5
5 years ago
Nikita Ioffe e182b26d64 Merge "vold: implement resetCheckpoint"
5 years ago
Nikita Ioffe 4eeebff8d5 Merge "vold: implement resetCheckpoint"
5 years ago
Xin Li 6881ac80c7 Skip QD1A.190821.011 in stage-aosp-master
5 years ago
Nikita Ioffe a5798fc115 vold: implement resetCheckpoint
5 years ago
Eric Biggers 6950716c0e Merge changes from topic "fscrypt-key-mgmt-improvements" am: 22d50012b0 am: de5c9ad178 am: 5a7cace2fc
5 years ago
Eric Biggers 9b673cedd1 vold: use new ioctls to add/remove fscrypt keys when supported am: f3dc4203dd am: 12a9212ac1 am: 20c8b122bb
5 years ago
Eric Biggers d5c689fd48 Merge changes from topic "fscrypt-key-mgmt-improvements" am: 22d50012b0 am: de5c9ad178
5 years ago
Eric Biggers 198abccf09 vold: use new ioctls to add/remove fscrypt keys when supported am: f3dc4203dd am: 12a9212ac1
5 years ago
Eric Biggers 5a7cace2fc Merge changes from topic "fscrypt-key-mgmt-improvements" am: 22d50012b0
5 years ago
Eric Biggers 20c8b122bb vold: use new ioctls to add/remove fscrypt keys when supported am: f3dc4203dd
5 years ago