Commit Graph

9577 Commits

Author SHA1 Message Date
Tao Bao 752386319c Clean up the sleep()'s after poking init services
Change-Id: I77564fe5c59e604f1377b278681b7d1bff53a77a
2015-05-27 14:48:56 -07:00
Tao Bao 7b126d77e8 am 73151b51: Merge "recovery: change the way of rebooting when using power key combo"
* commit '73151b5101c132091d5853dd635b3fc941f242dc':
  recovery: change the way of rebooting when using power key combo
2015-05-27 20:25:45 +00:00
Tao Bao 73151b5101 Merge "recovery: change the way of rebooting when using power key combo" 2015-05-27 19:28:21 +00:00
Ethan Yonker eb32b1ff00 Mount system as read-only by default
Mounting system as rw can prevent future OTA updates. The purpose
of this patch set is to prevent TWRP from mounting sytem as rw on
the first boot. Device maintainers should update their twrp.fstab
files on these devices to include an additional line:
/system_image emmc /dev/block/../system

This line will allow TWRP to create a raw system image backup to
ensure that the user can return to an original state for future
OTA updates.

Change-Id: I8929d85bc3a5b96cc564bc7f734b58d5612ec833
2015-05-27 09:22:49 -05:00
Nick Kralevich 770e7c6f70 am 8af11cff: am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""
* commit '8af11cffeb3ebe44300ce9066b547d35ab0c6815':
  Revert "recovery: change the way of rebooting when using power key combo"
2015-05-27 14:17:00 +00:00
Nick Kralevich 8af11cffeb am 6f6e5bb8: am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""
* commit '6f6e5bb89bf7019b57fc746de76913141b999c59':
  Revert "recovery: change the way of rebooting when using power key combo"
2015-05-27 14:03:23 +00:00
Nick Kralevich 6f6e5bb89b am 41928ce6: Merge "Revert "recovery: change the way of rebooting when using power key combo""
* commit '41928ce61da9b4e328f361f8295f83bd1149d430':
  Revert "recovery: change the way of rebooting when using power key combo"
2015-05-27 13:48:36 +00:00
Gaelle Nassiet e5ce2a5a10 recovery: change the way of rebooting when using power key combo
The power key combo allow to reboot from recovery mode by pressing
power button 7 times in a row. It calls directly the function
android_reboot() and lead to permission denial errors because of SE
Linux rules enforcement.
The right way to reboot from recovery is to set the property
"sys.powerctl" and let init handle it.

Change-Id: Ic7b81e446c3ee13dfbad10cda13a6a1f93123b76
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
2015-05-27 15:47:44 +02:00
Nick Kralevich 9f4ae3d548 am f0e2927d: am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"
* commit 'f0e2927d7c534693bb06a675fde08f2fdf423669':
  recovery: change the way of rebooting when using power key combo
2015-05-27 13:40:37 +00:00
Nick Kralevich 41928ce61d Merge "Revert "recovery: change the way of rebooting when using power key combo"" 2015-05-27 13:37:04 +00:00
Nick Kralevich 4e92ba4009 Revert "recovery: change the way of rebooting when using power key combo"
code doesn't compile:

  bootable/recovery/ui.cpp: In member function 'void RecoveryUI::ProcessKey(int, int)':
  bootable/recovery/ui.cpp:177:60: error: 'property_set' was not declared in this scope
                   property_set(ANDROID_RB_PROPERTY, "reboot,");
                                                            ^
  make: ***   [out/target/product/generic/obj/EXECUTABLES/recovery_intermediates/ui.o] Error 1

This reverts commit 074c1c2312.

Change-Id: I3e0a24279e202df29308ce41eaacc86bfde89e5a
2015-05-27 13:35:46 +00:00
Nick Kralevich f0e2927d7c am 6d1d7ffa: am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"
* commit '6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52':
  recovery: change the way of rebooting when using power key combo
2015-05-27 13:32:52 +00:00
Nick Kralevich 6d1d7ffa05 am b48bdbed: Merge "recovery: change the way of rebooting when using power key combo"
* commit 'b48bdbeda03af04ec8e0d52f6af680a9062eb916':
  recovery: change the way of rebooting when using power key combo
2015-05-27 13:19:10 +00:00
Nick Kralevich b48bdbeda0 Merge "recovery: change the way of rebooting when using power key combo" 2015-05-27 13:09:03 +00:00
Gaelle Nassiet 074c1c2312 recovery: change the way of rebooting when using power key combo
The power key combo allow to reboot from recovery mode by pressing
power button 7 times in a row. It calls directly the function
android_reboot() and lead to permission denial errors because of SE
Linux rules enforcement.
The right way to reboot from recovery is to set the property
"sys.powerctl" and let init handle it.

Change-Id: I5a6c3c49b27cef305815cef96da729390e19c9bc
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
2015-05-27 15:03:06 +02:00
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