Dan Albert
1a0fb83d70
am 9e9cbc9b: am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++."
...
* commit '9e9cbc9bbc9e87be3b83a471c02dbd21396fb484':
Stop using libstdc++.
2015-05-20 21:15:33 +00:00
Dan Albert
9e9cbc9bbc
am 0b1d1574: am a8cd96ad: Merge "Stop using libstdc++."
...
* commit '0b1d15742f4cc7f930981fc63ee74b5df51ce719':
Stop using libstdc++.
2015-05-20 21:08:11 +00:00
Dan Albert
0b1d15742f
am a8cd96ad: Merge "Stop using libstdc++."
...
* commit 'a8cd96adeeb530eda74e435e626900a3a76844a7':
Stop using libstdc++.
2015-05-20 20:54:49 +00:00
Dan Albert
a8cd96adee
Merge "Stop using libstdc++."
2015-05-20 20:39:57 +00:00
Matt Mower
f746dbb054
Only include uncrypt if not in system/core
...
Some android trees have uncrypt in system/core (cm-11.0). This breaks
building recovery since two modules of the same name conflict. Only
include the local copy of uncrypt if it doesn't already exist in
system/core.
Change-Id: Ie2d7cdedf0d4c9ad148c43b317d1f22d1e50e1f7
2015-05-19 21:08:46 +02:00
Tom Marshall
56fe5e71e5
recovery: Add lz4 libs if available
...
* Required by transparent compresssion in make_ext4fs.
Change-Id: I566c9e1281cc0dd725e96db32da0a1c3c000030e
2015-05-19 21:06:12 +02:00
that
203bcc97f7
partitionmanager: remove broken and unused progress calculation code
...
img_bps and file_bps were uninitialized (the values are only calculated
at the end of the backup), and occasionally could be 0.
Don't divide by zero, it's bad for the program's health.
Change-Id: I3f6f5a144c24f32508ca25de49491261c7f6e674
2015-05-19 20:54:43 +02:00
that
c7572eb87a
partition: support texfat module
...
Change-Id: I21d0498fc16fdb29d09d6e6fe715e57d1f35e72b
2015-05-19 20:50:00 +02:00
codelover
352b75eddb
Backup: fix 'out of memory' issue when backing up large partition as image
...
Restore: improve image restoration speed
* Workaround for devices that need to backup partition as image, eg: dm-verity
* Increased block size used for partition restore, now using 8M instead of 4K
Change-Id: Ie7e7ff3283d71a7e459d76f72caea9f57e71c628
2015-05-19 20:43:53 +02:00
Dan Albert
e49a9e527a
Stop using libstdc++.
...
These are already getting libc++, so it isn't necessary. If any of the
other static libraries (such as adb) use new or delete from libc++,
there will be symbol collisions.
Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
2015-05-19 11:33:18 -07:00
that
4e0e3fcfdb
bootloader: align with AOSP code
...
- Define a minimal Volume structure so that AOSP code for handling /misc
works in TWRP without major changes.
- Remove set/get_bootloader_message_*_name
Change-Id: Ifcee59568141a184adebb94b8ef8beca072a7942
2015-05-18 21:02:47 +02:00
Matt Mower
d411f8da8e
GUI: Prevent duplicate page overlays
...
If a page is requested for overlay, ensure it doesn't already exist in
the stack of existing overlays. If it does, erase the existing page
and push_back the new one.
Change-Id: I9feeea06cf7aad2e08a8c3bc567aaa761db2c3bc
2015-05-18 18:51:49 +02:00
Matt Mower
cf94db1d5b
TZ: Update default time zone string
...
The strings were updated in https://gerrit.omnirom.org/12827 but the
default values where accidentally forgotten.
Change-Id: I423f315cd9509fc61f14bfe4c13a28fbc2722315
2015-05-18 15:25:46 +02:00
Sami Tolvanen
0fa3844b8d
am b135645c: am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range"
...
* commit 'b135645c31bdb1f969453623c1e3f4b45508779f':
Add error and range checks to parse_range
2015-05-18 09:38:25 +00:00
Sami Tolvanen
b135645c31
am 6dc1e6a6: am 6253753a: Merge "Add error and range checks to parse_range"
...
* commit '6dc1e6a6ef943abf73f7b78f076fe395dc509c86':
Add error and range checks to parse_range
2015-05-18 09:31:58 +00:00
Sami Tolvanen
6dc1e6a6ef
am 6253753a: Merge "Add error and range checks to parse_range"
...
* commit '6253753ab9b8c8912f31aeb5cc2877a856ecfe82':
Add error and range checks to parse_range
2015-05-18 08:38:44 +00:00
Sami Tolvanen
6253753ab9
Merge "Add error and range checks to parse_range"
2015-05-18 08:08:54 +00:00
Elliott Hughes
55f17e3925
am 621fa7aa: am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery.
...
* commit '621fa7aaf72da2243328a5b9b92130011e0f5c7f':
Don't use TEMP_FAILURE_RETRY on close in recovery.
2015-05-16 01:42:04 +00:00
Elliott Hughes
4b86b04e3b
am 0b1e527a: am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."
...
* commit '0b1e527a804b8593d352e00738ed57dafd4b3f45':
Don't use TEMP_FAILURE_RETRY on close in recovery.
2015-05-16 01:42:04 +00:00
Elliott Hughes
621fa7aaf7
am 1857a7f5: Don\'t use TEMP_FAILURE_RETRY on close in recovery.
...
* commit '1857a7f57929a3bb4c831199b702059b259b0e3e':
Don't use TEMP_FAILURE_RETRY on close in recovery.
2015-05-16 01:30:39 +00:00
Elliott Hughes
0b1e527a80
am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."
...
* commit '09050fc92ef94a5ea0ee84f09f511850424f9216':
Don't use TEMP_FAILURE_RETRY on close in recovery.
2015-05-16 01:30:28 +00:00
Elliott Hughes
09050fc92e
am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."
...
* commit 'cd7d9d8374f45c7e2eb14d8dbabf3cf7c221a5b8':
Don't use TEMP_FAILURE_RETRY on close in recovery.
2015-05-16 01:17:48 +00:00
Elliott Hughes
1857a7f579
Don't use TEMP_FAILURE_RETRY on close in recovery.
...
Bug: http://b/20501816
Change-Id: I35efcd8dcec7a6492ba70602d380d9980cdda31f
(cherry picked from commit b47afedb42 )
2015-05-15 18:09:33 -07:00
Elliott Hughes
cd7d9d8374
Merge "Don't use TEMP_FAILURE_RETRY on close in recovery."
2015-05-16 01:08:55 +00:00
Elliott Hughes
b47afedb42
Don't use TEMP_FAILURE_RETRY on close in recovery.
...
Bug: http://b/20501816
Change-Id: I35efcd8dcec7a6492ba70602d380d9980cdda31f
2015-05-15 16:19:20 -07:00
Sami Tolvanen
f2bac04e1b
Add error and range checks to parse_range
...
Only trusted input is passed to parse_range, but check for invalid
input to catch possible problems in transfer lists.
Bug: 21033983
Bug: 21034030
Bug: 21034172
Bug: 21034406
Change-Id: Ia17537a2d23d5f701522fbc42ed38924e1ee3366
2015-05-15 18:48:28 +01:00
Dees Troy
c657cc0037
Support Qualcomm hardware decrypt
...
Change-Id: I121ef0f5da209be48f6d87559d539c7fc6d85336
2015-05-15 10:52:46 -05:00
Elliott Hughes
64f3e1a283
am 1fce2426: am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better."
...
* commit '1fce242653db7dbeca07523871175c758a47eea1':
init sets the default PATH itself, better.
2015-05-13 16:04:49 +00:00
Elliott Hughes
1fce242653
am 5bb8d551: am 3badd563: Merge "init sets the default PATH itself, better."
...
* commit '5bb8d55180db37bbfaedccc2261a2f55f21c4b73':
init sets the default PATH itself, better.
2015-05-13 15:52:35 +00:00
Elliott Hughes
5bb8d55180
am 3badd563: Merge "init sets the default PATH itself, better."
...
* commit '3badd56326422a79b5b09a98fc0282d915cf5e32':
init sets the default PATH itself, better.
2015-05-12 21:52:40 +00:00
Elliott Hughes
3badd56326
Merge "init sets the default PATH itself, better."
2015-05-12 21:43:15 +00:00
Elliott Hughes
4fd3446b4e
init sets the default PATH itself, better.
...
This fixes 'su' and 'strace' in the recovery image.
Change-Id: I83c2664d32a15da92bb6092fbdfc772184013c88
2015-05-12 14:35:31 -07:00
Dan Albert
e82033a897
am 9cd94f87: am cfe46542: am 3128176e: Merge "Fix build following adb change."
...
* commit '9cd94f87283159d80a51e1fce6ff68c97158b7ae':
Fix build following adb change.
2015-05-08 18:27:40 +00:00
Dan Albert
9cd94f8728
am cfe46542: am 3128176e: Merge "Fix build following adb change."
...
* commit 'cfe46542e424e5e2159cf5212f72ae8f53c589a6':
Fix build following adb change.
2015-05-08 18:14:53 +00:00
Dan Albert
cfe46542e4
am 3128176e: Merge "Fix build following adb change."
...
* commit '3128176e7d8f5cee4afdff3b5fdcadbe66ef97af':
Fix build following adb change.
2015-05-08 18:03:40 +00:00
Dan Albert
3128176e7d
Merge "Fix build following adb change."
2015-05-08 17:51:23 +00:00
Dan Albert
cc08a90cab
Fix build following adb change.
...
Change-Id: I2e0fb7e880e205b0bca324ff53ffdb5df9e34baf
2015-05-08 10:50:54 -07:00
Elliott Hughes
c23a39b1a4
am 81ad2bf8: am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."
...
* commit '81ad2bf86354638cfe5d7fa1eeb84882d69be19d':
Add an alternate screen for viewing recovery logs.
2015-05-07 17:19:03 +00:00
Tao Bao
31cfeeb9bf
am 92a13f56: am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"
...
* commit '92a13f5697228c6460bf740ccce4021b8a5e0bc8':
uncrypt: Switch to C++
2015-05-07 17:16:06 +00:00
Elliott Hughes
020bdab2be
am 11342f78: am df52e1e1: Add an alternate screen for viewing recovery logs.
...
* commit '11342f78cf78fe10042feedcb4fc7390235ff347':
Add an alternate screen for viewing recovery logs.
2015-05-07 17:15:50 +00:00
Elliott Hughes
81ad2bf863
am 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."
...
* commit '3257155e8957b8cba4b59d7928990f1642183415':
Add an alternate screen for viewing recovery logs.
2015-05-07 16:16:02 +00:00
Tao Bao
92a13f5697
am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"
...
* commit '25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2':
uncrypt: Switch to C++
2015-05-07 09:00:12 +00:00
Elliott Hughes
11342f78cf
am df52e1e1: Add an alternate screen for viewing recovery logs.
...
* commit 'df52e1e119804cc5e7d0b7f77a7d1bf42b2da9dc':
Add an alternate screen for viewing recovery logs.
2015-05-07 05:29:29 +00:00
Elliott Hughes
3257155e89
am 77a2c883: Merge "Add an alternate screen for viewing recovery logs."
...
* commit '77a2c8839f2de5947184605815015bc2696c3207':
Add an alternate screen for viewing recovery logs.
2015-05-07 04:25:56 +00:00
Elliott Hughes
df52e1e119
Add an alternate screen for viewing recovery logs.
...
This makes it easier to go back and forth without losing current output.
Also make the display more like regular more(1).
Bug: http://b/20834540
Change-Id: Icc5703e9c8a378cc7072d8ebb79e34451267ee1b
(cherry picked from commit c049163234 )
2015-05-06 21:20:10 -07:00
Elliott Hughes
77a2c8839f
Merge "Add an alternate screen for viewing recovery logs."
2015-05-07 04:17:46 +00:00
Elliott Hughes
c049163234
Add an alternate screen for viewing recovery logs.
...
This makes it easier to go back and forth without losing current output.
Also make the display more like regular more(1).
Bug: http://b/20834540
Change-Id: Icc5703e9c8a378cc7072d8ebb79e34451267ee1b
2015-05-06 21:17:05 -07:00
Tao Bao
e7c936812e
am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp
...
* commit '2ab0a57211bbfe62f8730550b8456e17ce59d5cf':
uncrypt: package on non-data partition should follow the right path
2015-05-06 23:54:12 +00:00
Tao Bao
2ab0a57211
resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp
...
Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c
2015-05-06 16:39:26 -07:00
Elliott Hughes
45903c33cf
am a6fb5418: am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change."
...
* commit 'a6fb541857d822939cada24574f566df87dda35d':
Track adb_thread_create API change.
2015-05-06 23:10:10 +00:00