203ab466d7
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 69a1fd86d3 -s ours
...
am: 5ccd3e3c39e3b772e0f7
5 years ago
5ccd3e3c39
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: 69a1fd86d3e3b772e0f7
5 years ago
69a1fd86d3
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
Bug: 135460123
Change-Id: I1605f33ede34c8289a6eede94b62c8695df81b63
Merged-In: I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e
5 years ago
caeeec6490
Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1 am: e3b772e0f7
...
am: 149f8d0754
5 years ago
149f8d0754
Merge "Remove libhwbinder/libhidltransport deps" am: 88a19b6fe1
...
am: e3b772e0f7
5 years ago
e3b772e0f7
Merge "Remove libhwbinder/libhidltransport deps"
...
am: 88a19b6fe1
5 years ago
88a19b6fe1
Merge "Remove libhwbinder/libhidltransport deps"
5 years ago
ae4ee5e447
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours am: 9938a041f4
...
am: 33658d3c27
5 years ago
4496ef9d34
Remove libhwbinder/libhidltransport deps
...
Since these were combined into libhidlbase.
Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I890b572d537d66ecb49effd8efc782279c52956e
5 years ago
33658d3c27
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d3ceab2566 -s ours
...
am: 9938a041f4
5 years ago
9938a041f4
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
...
am: d3ceab2566
5 years ago
d3ceab2566
Merge "DO NOT MERGE - Merge Android 10 into master"
5 years ago
85a94961df
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258
5 years ago
68094b8d13
Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be am: 4b1dad6065
...
am: d0282ac35d
5 years ago
d0282ac35d
Merge "Fix ext4/metadata/udc issue" am: ee867be1f1 am: 3096e373be
...
am: 4b1dad6065
5 years ago
4b1dad6065
Merge "Fix ext4/metadata/udc issue" am: ee867be1f1
...
am: 3096e373be
5 years ago
3096e373be
Merge "Fix ext4/metadata/udc issue"
...
am: ee867be1f1
5 years ago
ee867be1f1
Merge "Fix ext4/metadata/udc issue"
5 years ago
0f3c17b50f
Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899 am: 9cd7fdc882
...
am: 06bd0c427f
5 years ago
06bd0c427f
Merge "Fix crash in mainline" am: 3a0d51f6b7 am: 6c5944f899
...
am: 9cd7fdc882
5 years ago
9cd7fdc882
Merge "Fix crash in mainline" am: 3a0d51f6b7
...
am: 6c5944f899
5 years ago
6c5944f899
Merge "Fix crash in mainline"
...
am: 3a0d51f6b7
5 years ago
3a0d51f6b7
Merge "Fix crash in mainline"
5 years ago
9a6d1f73e5
Fix crash in mainline
...
Current behavior:
Assume not checkpointing
cp_startCheckpoint creates the file in metadata
cp_needsCheckpoint will now set isCheckpointing to true
cp_commitCheckpoint will now think there is a checkpoint, and try to
commit it. This will fail on ext4 and it will return false, leading to
bad things.
cp_startCheckpoint is called when staging an apex module for update.
After this point, several things could go wrong:
If a keystore key is deleted, it calls cp_needsCheckpoint to see if the
delete should be deferred until cp_commitCheckpoint. The delete will now
be deferred, meaning that this key will never be deleted, using up the
key sots in trustzone
If a trim is scheduled through idle maintenance, this also calls
cp_needsCheckpoint, so the trims will not occur.
If either of these happens before a system crash, the device will not
recover since the system calls commitCheckpoint which will now crash.
When the system then goes on to reboot, the checkpoint will not be
triggered, since the commitCheckpoint call will have deleted the
checkpoint flag file before crashing.
Bug: 138952436
Test: vdc checkpoint startCheckpoint 5
vdc checkpoint needsCheckpoint
vdc checkpoint commitChanges
stop;start
commitChanges fails, then device loops
After applying this test, commitChanges succeeds and device does
not loop
Change-Id: I135099625f77344d1f8d2e8688735871c44ef2f5
5 years ago
18aca481ff
Merge "Fix race condition is commitCheckpoint" am: 1059810759 am: 556bd755e6 am: 86bc2a32d8
...
am: 466c1c07dd
5 years ago
466c1c07dd
Merge "Fix race condition is commitCheckpoint" am: 1059810759 am: 556bd755e6
...
am: 86bc2a32d8
5 years ago
86bc2a32d8
Merge "Fix race condition is commitCheckpoint" am: 1059810759
...
am: 556bd755e6
5 years ago
556bd755e6
Merge "Fix race condition is commitCheckpoint"
...
am: 1059810759
5 years ago
1059810759
Merge "Fix race condition is commitCheckpoint"
5 years ago
1d57f686a3
Fix race condition is commitCheckpoint
...
If cp_commitCheckpoint is called twice at the same time, the second call
to setBowState will fail.
Add lock to remove possibility, and protect all uses of isCheckpointing
Bug: 138952436
Test: Boots after flashing in checkpoint mode
Change-Id: I131298adc506c3c176774d15e642b13d5f991087
5 years ago
4b140d397f
Fix ext4/metadata/udc issue
...
Test: Cannot test since no device supports this combo
Bug: 137924328
Change-Id: I451c90e0826ede71876f3e4f260e7083f3ab3fdb
5 years ago
c4fd7be670
Snap for 5797917 from 6c5e453f9e to qt-c2f2-release
...
Change-Id: I92e29452f176731c03fc482e5394cc5fad17c9c9
5 years ago
7ebe1a4bd8
secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e
...
am: 2af145ef20
5 years ago
ceac8b8587
secdiscard: should call fsync to avoid reordering IOs am: 6c5e453f9e
...
am: 732faaeb94
5 years ago
732faaeb94
secdiscard: should call fsync to avoid reordering IOs
...
am: 6c5e453f9e
5 years ago
2af145ef20
secdiscard: should call fsync to avoid reordering IOs
...
am: 6c5e453f9e
5 years ago
6c5e453f9e
secdiscard: should call fsync to avoid reordering IOs
...
Don't make stale zero'ing IO in block device after unlink, since filesystem
can reuse the block addresses and issue some IOs. If block layer reordered
two IOs, filesystem will see zero data, which crashes filesystem consistency.
Bug: 136964285
Test: run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.CrossProfileAppsHostSideTest
Change-Id: I43c13622d094cecda1c53468adc240002111d605
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
5 years ago
0be952d362
Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe am: e91c2686e9
...
am: d26cb98c4d
5 years ago
d26cb98c4d
Merge "libdm now requires linking to libext2_uuid." am: 9e821da9fe
...
am: e91c2686e9
5 years ago
e91c2686e9
Merge "libdm now requires linking to libext2_uuid."
...
am: 9e821da9fe
5 years ago
9e821da9fe
Merge "libdm now requires linking to libext2_uuid."
5 years ago
ccf6d331b8
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 711f4faac3 -s ours am: e7487087d0 -s ours
...
am: 49304ac627
5 years ago
1c4860773a
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49 -s ours am: 2c1e06e589 -s ours
...
am: 4c373e4563
5 years ago
49304ac627
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master" am: 711f4faac3 -s ours
...
am: e7487087d0
5 years ago
e7487087d0
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
...
am: 711f4faac3
5 years ago
4c373e4563
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 33080d8b49 -s ours
...
am: 2c1e06e589
5 years ago
2c1e06e589
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 33080d8b49
5 years ago
711f4faac3
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
5 years ago
33080d8b49
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: I2fc2c9bb2631e627ebe74b6f081819c1eb0f3fcd
5 years ago
ec0cb71ca1
Snap for 5622519 from 59295fbb94 to pi-platform-release
...
Change-Id: I402d144258df8eefe4c87766616ba32221bfbb67
5 years ago
Xin Li
Steven Moreland
Treehugger Robot
Paul Lawrence
android-build-team Robot
Jaegeuk Kim
David Anderson