Commit Graph

1348 Commits

Author SHA1 Message Date
Sami Tolvanen cd391c2388 am aa4df5c4: Merge "Handle BLKDISCARD failures"
* commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd':
  Handle BLKDISCARD failures
2015-05-28 16:21:04 +00:00
Sami Tolvanen aa4df5c45b Merge "Handle BLKDISCARD failures" 2015-05-28 16:12:25 +00:00
Sami Tolvanen cc2428c818 Handle BLKDISCARD failures
In the block updater, if BLKDISCARD fails, the error is silently
ignored and some of the blocks may not be erased. This means the
target partition will have inconsistent contents.

If the ioctl fails, return an error and abort the update.

Bug: 20614277
Change-Id: I33867ba9337c514de8ffae59f28584b285324067
2015-05-28 09:09:02 +01:00
Tao Bao 9a5e2a2611 am f272b9e7: Merge "Clean up the sleep()\'s after poking init services"
* commit 'f272b9e777de92f96b9298889bf145e40c5db2e3':
  Clean up the sleep()'s after poking init services
2015-05-27 23:35:47 +00:00
Tao Bao f272b9e777 Merge "Clean up the sleep()'s after poking init services" 2015-05-27 23:17:13 +00:00
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
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 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 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 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
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
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 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 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
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 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 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 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 25a67fde9f am 7ff339ea: Merge "uncrypt: Switch to C++"
* commit '7ff339ea1b36d46439e9255364cd9a4b2e73719a':
  uncrypt: Switch to C++
2015-05-06 19:32:41 +00:00
Tao Bao 7ff339ea1b Merge "uncrypt: Switch to C++" 2015-05-06 19:21:41 +00:00
Tao Bao 381f455cac uncrypt: Switch to C++
Also apply some trivial changes like int -> bool and clean-ups.

Change-Id: Ic55fc8b82d7e91b321f69d10175be23d5c04eb92
2015-05-06 11:43:11 -07:00
Tao Bao 550bd340c3 am aeb980bd: Merge "uncrypt: package on non-data partition should follow the right path"
* commit 'aeb980bd8958e3c6e135835aa7d34b5c4e3a601b':
  uncrypt: package on non-data partition should follow the right path
2015-05-06 01:30:44 +00:00
Tao Bao aeb980bd89 Merge "uncrypt: package on non-data partition should follow the right path" 2015-05-06 01:18:11 +00:00
Tao Bao fb4ccef1df uncrypt: package on non-data partition should follow the right path
Fix the accidental change of behavior in [1]. OTA packages not on /data
partition should still go through the path that has validity checks and
wipe_misc() steps.

[1]: commit eaf33654c1.

Change-Id: Ice9a049f6259cd2368d2fb95a991f8a6a0120bdd
2015-05-05 17:51:28 -07:00
Elliott Hughes 481508426c am 41c7ef54: Merge "Track adb_thread_create API change."
* commit '41c7ef5400634508db5127ea45108cf94f8e36ab':
  Track adb_thread_create API change.
2015-05-05 21:49:39 +00:00
Elliott Hughes 41c7ef5400 Merge "Track adb_thread_create API change." 2015-05-05 21:40:47 +00:00
Elliott Hughes 921431ffc0 Track adb_thread_create API change.
Change-Id: Ia3f30f3ba85c0246d4b667fb7723cfcdce299d4a
2015-05-05 14:37:53 -07:00
Tao Bao 185e8204c6 am c7f64fdf: Merge "Keep multiple kernel logs"
* commit 'c7f64fdf08b254ff94012c1815198b9635f508a7':
  Keep multiple kernel logs
2015-05-05 21:30:49 +00:00
Tao Bao c7f64fdf08 Merge "Keep multiple kernel logs" 2015-05-05 21:20:47 +00:00
Tao Bao bef39710ff Keep multiple kernel logs
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs.

Bug: http://b/18092237
Change-Id: I1bf5e230de3efd6a48a5b2ae5a34241cb4d9ca90
2015-05-05 14:09:29 -07:00
Tao Bao 0a7b92762a am f8f88321: Merge "Turn on text display for debuggable builds"
* commit 'f8f8832179003ad0a4e9359ef16e2f49d9f38345':
  Turn on text display for debuggable builds
2015-05-04 17:11:46 +00:00
Tao Bao f8f8832179 Merge "Turn on text display for debuggable builds" 2015-05-04 17:05:20 +00:00
Tao Bao 785d22c88c Turn on text display for debuggable builds
For userdebug and eng builds, turn on the text display automatically
if no command is specified.

Bug: http://b/17489952
Change-Id: I3d42ba2848b968da12164ddfda915ca69dcecba1
2015-05-04 09:59:29 -07:00
Elliott Hughes 4b3004a6c9 am 59e1e3e7: Merge "Fix mips64 minadbd_test build."
* commit '59e1e3e78f53438cb5843d7e151dddb0d782328c':
  Fix mips64 minadbd_test build.
2015-05-02 05:47:12 +00:00
Elliott Hughes 59e1e3e78f Merge "Fix mips64 minadbd_test build." 2015-05-02 05:39:07 +00:00