Daniel Rosenberg
99ae565fbf
Merge "Switch to exceptions for most cp calls" am: ece7e231a6
...
am: bc6c1ff8df
2018-10-16 14:40:05 -07:00
Daniel Rosenberg
bc6c1ff8df
Merge "Switch to exceptions for most cp calls"
...
am: ece7e231a6
2018-10-16 14:34:54 -07:00
Daniel Rosenberg
3bfb996597
Remove spurious function declaration
...
Test: Nothing changes
Change-Id: I27f0d832d33099efe25794987c307d773b5d987c
Merged-In: Icba16578608a6cbf922472e9d4ae5b8cf5f016c6
2018-10-16 21:28:13 +00:00
Treehugger Robot
ece7e231a6
Merge "Switch to exceptions for most cp calls"
2018-10-16 21:14:34 +00:00
Daniel Rosenberg
73680ec382
Switch to exceptions for most cp calls
...
This switches the checkpoint calls that don't need to return a value
to return 0 on success, and an error on failure. This will be transalted
to exceptions for java binder users. needsCheckpoint and needsRollback
still return a boolean value.
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug: 112901762
Change-Id: Idd3b5e6036631562a86d5123f533b86cf3bd6032
Merged-In: Idd3b5e6036631562a86d5123f533b86cf3bd6032
2018-10-16 20:06:47 +00:00
Daniel Rosenberg
c879ec2005
Merge "Handle retry count" am: e74587af4d
...
am: e1e3dc3698
2018-10-15 21:36:13 -07:00
Daniel Rosenberg
e1e3dc3698
Merge "Handle retry count"
...
am: e74587af4d
2018-10-15 21:19:59 -07:00
Treehugger Robot
e74587af4d
Merge "Handle retry count"
2018-10-16 01:25:34 +00:00
Daniel Rosenberg
80d1ca5600
Handle retry count
...
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug: 112901762
Change-Id: I85a71d059bca27b76175b9bd8465cc453f0ddb8d
2018-10-15 22:13:41 +00:00
android-build-team Robot
2ab3b948d7
Snap for 5066295 from 74b92dc85f to pi-qpr2-release
...
Change-Id: I4408d15c38595eb7903e4a7544da0a4586a743a9
2018-10-12 22:51:12 +00:00
Rubin Xu
8b6ebe4817
[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b am: b1498d1d87 am: 89858102c2 -s ours
...
am: 74b92dc85f
2018-10-11 16:28:26 -07:00
Rubin Xu
74c3059924
[automerger skipped] [automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6 skipped: ded6cb5910 am: 0d2edbd6ab am: b078fd6b8c am: 6460a0149b -s ours
...
am: a815fe5d4c
2018-10-11 16:28:05 -07:00
Rubin Xu
74b92dc85f
[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b am: b1498d1d87
...
am: 89858102c2
2018-10-11 16:24:06 -07:00
Rubin Xu
a815fe5d4c
[automerger skipped] [automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6 skipped: ded6cb5910 am: 0d2edbd6ab am: b078fd6b8c
...
am: 6460a0149b
2018-10-11 16:23:55 -07:00
Rubin Xu
89858102c2
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
...
am: b1498d1d87
2018-10-11 16:16:03 -07:00
Rubin Xu
6460a0149b
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6 skipped: ded6cb5910 am: 0d2edbd6ab
...
am: b078fd6b8c
2018-10-11 16:15:48 -07:00
Rubin Xu
b1498d1d87
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev
...
am: 92e63e3f9b
2018-10-11 16:10:57 -07:00
Rubin Xu
b078fd6b8c
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6 skipped: ded6cb5910
...
am: 0d2edbd6ab
2018-10-11 16:10:41 -07:00
TreeHugger Robot
92e63e3f9b
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev
2018-10-11 23:01:50 +00:00
Rubin Xu
19ef1ae99a
[DO NOT MERGE] Fix signedness mismatch and integer underflow
...
persist_get_max_entries() is supposed to return an unsigned integer as the
maximum number of entries but it also wrongly returns "-1" as an error
condition. Also fix an issue where an unsigned subtraction in this routine
could lead to integer underflow.
Bug: 112731440
Test: manual
Change-Id: I9672e39bef2c12156dda7806a08c52044962c178
2018-10-11 11:12:16 +01:00
Bill Rassieur
87135e28b2
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
...
Change-Id: Ifb0130fa2b413d1b8a769684cffb6c6621ea9859
BUG: 117431430
2018-10-10 17:33:05 +00:00
Android Build Merger (Role)
0d2edbd6ab
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6 skipped: ded6cb5910
...
Change-Id: I4a1b7a1509d00fba8e35755d2fb198c47e9f3999
2018-10-10 10:26:09 +00:00
Android Build Merger (Role)
ded6cb5910
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e am: 972b5551f6
...
Change-Id: I878947630e3cec949dbfa361a379637a30d67a1d
2018-10-10 10:26:07 +00:00
Android Build Merger (Role)
972b5551f6
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9 am: 279cc3d65e
...
Change-Id: If379e03d3998c1267bc66f53b308ea28bcd4c128
2018-10-10 10:26:06 +00:00
Android Build Merger (Role)
279cc3d65e
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53 am: 08bd47e9a9
...
Change-Id: Ie536c5dd8c447cd3753725040edbec7ce478ea07
2018-10-10 10:26:04 +00:00
Android Build Merger (Role)
08bd47e9a9
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
...
Change-Id: I094ac59296a118fbacc70b4ead1230b4d8683fa2
2018-10-10 10:26:02 +00:00
Rubin Xu
ef35553d53
[DO NOT MERGE] Fix signedness mismatch and integer underflow
...
persist_get_max_entries() is supposed to return an unsigned integer as the
maximum number of entries but it also wrongly returns "-1" as an error
condition. Also fix an issue where an unsigned subtraction in this routine
could lead to integer underflow.
Bug: 112731440
Test: manual
Change-Id: I9672e39bef2c12156dda7806a08c52044962c178
2018-10-10 11:23:54 +01:00
Daniel Rosenberg
9e9f7cb820
Merge "Add checkpointing support for A/B updates" am: ba1752008d
...
am: 0b875d7630
2018-10-04 18:57:12 -07:00
Daniel Rosenberg
0b875d7630
Merge "Add checkpointing support for A/B updates"
...
am: ba1752008d
2018-10-04 18:48:04 -07:00
Daniel Rosenberg
ba1752008d
Merge "Add checkpointing support for A/B updates"
2018-10-05 01:31:18 +00:00
Paul Lawrence
704da32b50
Merge "Use unique points for fstab" am: 1e1893812c
...
am: 1c6d73bfcc
2018-10-03 17:52:04 -07:00
Paul Lawrence
1c6d73bfcc
Merge "Use unique points for fstab"
...
am: 1e1893812c
2018-10-03 17:28:34 -07:00
Treehugger Robot
1e1893812c
Merge "Use unique points for fstab"
2018-10-03 23:57:39 +00:00
Daniel Rosenberg
d399249855
Add checkpointing support for A/B updates
...
This adds implicit rollback support during A/B style updates.
If you explicitly start a checkpoint with -1, needsRollback will
trigger if the update fails, and should be used if any additional
cleanup is needed that is not covered by A/B itself.
Test: All Checkpoint tests pass
Bug: 111020314
Change-Id: I88b4a1098c6bac4dc1438a54c8a8f59577a6c17b
2018-10-03 15:39:25 -07:00
Paul Lawrence
2040089ab0
Use unique points for fstab
...
Test: Checkpoint test script runs and passes
Change-Id: I13005da22aef5fda3d1e0941949db02ff0ff0870
2018-10-03 14:19:31 -07:00
Paul Lawrence
f6c099af3a
Merge "Make checkpointing work on ext4" am: ac244261c8
...
am: 61c3eaf068
2018-10-03 13:46:27 -07:00
Paul Lawrence
61c3eaf068
Merge "Make checkpointing work on ext4"
...
am: ac244261c8
2018-10-03 13:31:25 -07:00
Treehugger Robot
ac244261c8
Merge "Make checkpointing work on ext4"
2018-10-03 20:15:48 +00:00
Paul Lawrence
1abb2fe278
Make checkpointing work on ext4
...
Test: All tests pass
Change-Id: I2a6cdf1edfe752f4633e1931e75d18659653938c
2018-10-03 09:15:27 -07:00
Mark Salyzyn
52ea568e2a
Merge "Protect /mnt/scratch from stale umount on userdebug" am: b39e6f2887
...
am: 74a6c69e57
2018-10-02 16:32:40 -07:00
Mark Salyzyn
74a6c69e57
Merge "Protect /mnt/scratch from stale umount on userdebug"
...
am: b39e6f2887
2018-10-02 15:24:57 -07:00
Treehugger Robot
b39e6f2887
Merge "Protect /mnt/scratch from stale umount on userdebug"
2018-10-02 21:31:12 +00:00
Mark Salyzyn
c4405e9c17
Protect /mnt/scratch from stale umount on userdebug
...
On userdebug protect /mnt/scratch. On user builds ensure that
/mnt/scratch is considered a stale mount so it can not be used.
vold runs before ro.debuggable is set, so this must be a compile
time decision.
Minor technical debt cleanup associated with using android::base.
Test: compile
Bug: 109821005
Change-Id: I8efdbedfe850dd24daecf03a37aea61de47edc7d
Merged-In: I8efdbedfe850dd24daecf03a37aea61de47edc7d
2018-10-02 18:00:49 +00:00
Sudheer Shanka
65eac7fc1a
Merge "Remove unmount_tree in VolumeManager." am: 9931db7e59
...
am: 96707825f2
2018-09-28 18:29:16 -07:00
Sudheer Shanka
96707825f2
Merge "Remove unmount_tree in VolumeManager."
...
am: 9931db7e59
2018-09-28 17:33:19 -07:00
Sudheer Shanka
9931db7e59
Merge "Remove unmount_tree in VolumeManager."
2018-09-28 23:49:51 +00:00
Sudheer Shanka
99d304ac60
Remove unmount_tree in VolumeManager.
...
This is not needed anymore since everything else is updated
to use android::vold::UnmountTree.
Bug: 111890351
Test: manual
Change-Id: Idb574469763fa3438fbfc40d6da786d87ac63c38
2018-09-28 13:38:39 -07:00
Sudheer Shanka
e9c88c4c6c
Merge "Add unmountTree to utils." am: a64572431e
...
am: f5b24f1015
2018-09-27 13:21:59 -07:00
Sudheer Shanka
f5b24f1015
Merge "Add unmountTree to utils."
...
am: a64572431e
2018-09-27 13:14:30 -07:00
Sudheer Shanka
a64572431e
Merge "Add unmountTree to utils."
2018-09-27 19:54:23 +00:00
