Treehugger Robot
6e3441a8ea
Merge "Removed obsolete Test"
5 years ago
Janis Danisevskis
8c4eb2c2c0
Removed obsolete Test
...
The HidlizationEquivalenceTest was used to make sure the same key is
computed by the scrypt algorithm regardless of whether the old
(<= KM2 HAL pre treble) or the new (>= KM3.0 treble) HAL was used.
Since the treble is now the default, and old HAL don't even exist on
new devices, we should call the migration a success and drop this test
altogether.
Test: Removed obsolete Code
Bug: 68197448
Change-Id: If10c79bafac4d0c8268675cbb8e1c4b46974aab5
5 years ago
Tianjie Xu
09de0ff8d6
Clear the warm_reset flag after boot is successful
...
The property is set to inform kernel to do a warm_reset on the next
reboot. This is useful to persist the logs to debug device boot
failures. After the slot has been marked as boot successful, we can drop
the warm_reset flag to avoid the performance overhead on the next
reboot.
Bug: 143489994
Test: check the property is set to 0 by vold
Change-Id: If7c922f40bcf9a6f7894af0a334ab23d88d40d17
5 years ago
Zimuzo Ezeozue
b287ea6a02
Merge "Add zezeozue to OWNERS" am: f9972055f5
...
am: e8db702702
Change-Id: I0b6a7b06d1ce39e8e70e87a14b312425c55828d5
5 years ago
Zimuzo Ezeozue
e8db702702
Merge "Add zezeozue to OWNERS"
...
am: f9972055f5
Change-Id: I45c211d810f1a15e0b5a1f4decc33a0eece8dafd
5 years ago
Zimuzo Ezeozue
f9972055f5
Merge "Add zezeozue to OWNERS"
5 years ago
Zim
076967a823
Add zezeozue to OWNERS
...
Test: n/a
Change-Id: I75339fcea5d4e537c6312e8e515b6dd62d7ae7fc
5 years ago
shaozhongqi
42726be6a3
Merge "Exfat Need to add automatic repair function when exfat fsck device" am: 7e249ebdae
...
am: 8006c80960
Change-Id: I74cdf0596642b2db70f4507eefc8acd68ad1fe26
5 years ago
shaozhongqi
8006c80960
Merge "Exfat Need to add automatic repair function when exfat fsck device"
...
am: 7e249ebdae
Change-Id: I835a8717fb25b651ce815c9912322b84e9d66041
5 years ago
Treehugger Robot
7e249ebdae
Merge "Exfat Need to add automatic repair function when exfat fsck device"
5 years ago
shaozhongqi
081cf8efdb
Exfat Need to add automatic repair function when exfat fsck device
...
bug:143229109
Test: Manual
Change-Id: Ibf650bdcb378dd9c07f904bdd18b36f376b45b61
Signed-off-by: shaozhongqi <shaozhongqi@xiaomi.com>
5 years ago
Paul Crowley
ff5ad94627
Merge "Remove libfscrypt now it's in libfs_mgr" am: 43f8298bdd
...
am: ce187e7fd6
Change-Id: I67dab6b461cf9eebc91db8d922c100b786597f1d
5 years ago
Paul Crowley
ce187e7fd6
Merge "Remove libfscrypt now it's in libfs_mgr"
...
am: 43f8298bdd
Change-Id: I0eaafaa461fa2ec6153a3e3bf49926b2efc610b7
5 years ago
Paul Crowley
43f8298bdd
Merge "Remove libfscrypt now it's in libfs_mgr"
5 years ago
Xin Li
ac868f7b3c
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: b89717b9c3
Change-Id: Ibaa7773225c1fa7b64bce5d23dc46afae27ffee4
5 years ago
Paul Crowley
8bf310b9f3
Remove libfscrypt now it's in libfs_mgr
...
Now that we include libfscrypt in libfs_mgr via whole_static_libs we
should not reference it directly.
Bug: 143307095
Test: treehugger
Change-Id: I4cd138b50131ec8ce7835d9604c89c99cae53212
5 years ago
Xin Li
b89717b9c3
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: Ib50f11f8f97ebd427da22b31e484777ef3210fe6
5 years ago
Paul Crowley
f3a6282a63
Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095
am: 18b8ad91b8
...
am: 2615e01740
Change-Id: I8b2664197f51ecf3379e0de0e4303c71f0e2302b
5 years ago
Paul Crowley
9c715f4b3a
Replace "flags" property with "options" with same format as fstab am: f612b8b5ab
am: 0ae752dcc3
...
am: d9261cd394
Change-Id: I0c25c833a30130c3a5aa3a47f260351734332dd4
5 years ago
Paul Crowley
2615e01740
Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095
...
am: 18b8ad91b8
Change-Id: Ic1e283752dd13c30ee79e6f95600e38580eec23d
5 years ago
Paul Crowley
d9261cd394
Replace "flags" property with "options" with same format as fstab am: f612b8b5ab
...
am: 0ae752dcc3
Change-Id: I6446dd9eeb08958ab0a4e5c6d222ec7bdc4d6547
5 years ago
Paul Crowley
18b8ad91b8
Merge changes from topics "fscrypt-options", "fstab-options"
...
am: c17827b095
Change-Id: I9a992f0da7b5199b40ce650c2eb20258cab2b562
5 years ago
Paul Crowley
0ae752dcc3
Replace "flags" property with "options" with same format as fstab
...
am: f612b8b5ab
Change-Id: I30c51da82bdeb27a2dae7251762bb1a5241afcb8
5 years ago
Paul Crowley
c17827b095
Merge changes from topics "fscrypt-options", "fstab-options"
...
* changes:
Use new encryption_options fstab entry
Replace "flags" property with "options" with same format as fstab
5 years ago
Paul Crowley
a50f6c3c2c
Use new encryption_options fstab entry
...
Bug: 143307095
Test: change cuttlefish fstab
Change-Id: Ia40daafc9b573c40f29c74dc2ef513fba3fc2bf9
5 years ago
Nikita Ioffe
667dadb67a
Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b
am: 3dbe996112
...
am: 536830ac65
Change-Id: I3f9ee004ffef19b5e0f83cbb50e98a2939d2202b
5 years ago
Nikita Ioffe
536830ac65
Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b
...
am: 3dbe996112
Change-Id: I2b4f95bd3edbbfe2c6843dc06cd9ad1a156ca532
5 years ago
Nikita Ioffe
3dbe996112
Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
...
am: f37dff724b
Change-Id: Iaa1ce493c5fc67e280e4e3d656f434ad86e74f80
5 years ago
Nikita Ioffe
f37dff724b
Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
5 years ago
Xin Li
da152fccb0
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac
-s ours am: c21f19338e
-s ours
...
am: a69c584aaa
-s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65
is in history
Change-Id: If55c2cd2bdc8cd6329ba62e34e8979cdd645e5b3
5 years ago
Xin Li
a69c584aaa
[automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac
-s ours
...
am: c21f19338e
-s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65
is in history
Change-Id: I520c3ad27bc01eef706f411e064584dcf6268ba3
5 years ago
Xin Li
c21f19338e
[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
...
am: be4ff998ac
-s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65
is in history
Change-Id: If1bc31b59c868707ff2b4ee406bcad0fa9da25d3
5 years ago
Xin Li
ee393feadc
[automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c
-s ours am: 119618a381
-s ours
...
am: b462c16fb6
-s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65
is in history
Change-Id: I852ab9b92bb553cc7f2fc6c5dd556e75356020b0
5 years ago
Xin Li
b462c16fb6
[automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c
-s ours
...
am: 119618a381
-s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65
is in history
Change-Id: I6719833c4f030b7cf0d14dce49956ea3f8362c1a
5 years ago
Xin Li
119618a381
[automerger skipped] Merge Coral/Flame into AOSP master
...
am: 8a9454c35c
-s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65
is in history
Change-Id: I0e4e568d378d9412f2239f37ba2c475ad4f5f30b
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
...
A little bit more self-explanatory name that explicitly says that root
is also allowed.
Test: builds
Change-Id: Ice20ffcba2a0994c599dbebace252138ffd827de
Merged-In: Ice20ffcba2a0994c599dbebace252138ffd827de
5 years ago
Paul Crowley
9572a9fcdc
Merge "Use new C++ libfscrypt interface." am: 7e43d985cf
am: e96e670746
...
am: d1823f16c8
Change-Id: Iaeb2a0087c307ff24b9161280fd3ab4fe5bae451
5 years ago
Paul Crowley
d1823f16c8
Merge "Use new C++ libfscrypt interface." am: 7e43d985cf
...
am: e96e670746
Change-Id: Ia3caaae26d30f5f3329ae36c1aac02e592118d0b
5 years ago
Paul Crowley
e96e670746
Merge "Use new C++ libfscrypt interface."
...
am: 7e43d985cf
Change-Id: Ie2a437086f901d4e353e71ac5db8751f518bd833
5 years ago
Paul Crowley
7e43d985cf
Merge "Use new C++ libfscrypt interface."
5 years ago
Xin Li
8a9454c35c
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: I487bba24e1c3cef357a408424665f0348162345d
Merged-In: I7191bd73d8621831c5802e02817f459f1da32754
5 years ago
Paul Crowley
f612b8b5ab
Replace "flags" property with "options" with same format as fstab
...
Bug: 143307095
Test: Set override, check policy is as expected with sm set-virtual-disk
Change-Id: Iec31d7530b15d6d4564100816c821394e0708d53
5 years ago
Paul Crowley
5e53ff6e8f
Use new C++ libfscrypt interface.
...
Bug: 143307095
Test: treehugger
Change-Id: I420ba6223bd67d6fec5382a11a72b7aa124294c9
5 years ago
Xin Li
fb9bf0fb6a
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master am: e9679eaa46
...
am: dd369ccddf
Change-Id: I3cc3f3b41c2744764e5adc45288886af211e6a7b
5 years ago
Xin Li
dd369ccddf
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
...
am: e9679eaa46
Change-Id: I866951f186a6cc50dc9647077e4f6f915e4bdfc4
5 years ago
TreeHugger Robot
e9679eaa46
Merge "Skip QD1A.190821.011 in stage-aosp-master" into stage-aosp-master
5 years ago
Paul Lawrence
042a67afa1
Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d
am: a2c2182b65
...
am: 0496f970a3
Change-Id: I5215f7b8b82b0aa9ec598cd0d8de3848c5bef3fb
5 years ago
Paul Lawrence
0496f970a3
Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d
...
am: a2c2182b65
Change-Id: I6498dcc83ed0b30850ae9cc1e94af1510bf89836
5 years ago
Paul Lawrence
a2c2182b65
Merge "Make sure CtsCheckpointTestCases passes"
...
am: 21799c8f7d
Change-Id: I7191bd73d8621831c5802e02817f459f1da32754
5 years ago