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
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
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
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
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
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
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
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
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
a6fb541857
am 48150842: am 41c7ef54: Merge "Track adb_thread_create API change."
...
* commit '481508426cb258ebf809a9f46ec4f5689d0459ef':
Track adb_thread_create API change.
2015-05-06 22:45:49 +00:00
Tao Bao
d5148f35ec
am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs"
...
* commit '185e8204c6e29e2177721a30c73928fb4e5382fa':
Keep multiple kernel logs
2015-05-06 22:45:40 +00:00
Tao Bao
c017c597b2
am 3e8d28b5: uncrypt: Switch to C++
...
* commit '3e8d28b547cd75af3f77f38a7e2895d0dbd2e232':
uncrypt: Switch to C++
2015-05-06 19:43:51 +00: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
3e8d28b547
uncrypt: Switch to C++
...
Also apply some trivial changes like int -> bool and clean-ups.
Change-Id: I5c6c42d34965305c394f4f2de78487bd1174992a
(cherry picked from commit 381f455cac )
2015-05-06 12:23:41 -07: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
8d312ed601
am 8853cb2f: uncrypt: package on non-data partition should follow the right path
...
* commit '8853cb2f296adfdc57871e9482a8e97b0011b323':
uncrypt: package on non-data partition should follow the right path
2015-05-06 01:42:25 +00: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
8853cb2f29
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: I3e86e19f06603bfe6ecc691c9aa66a8a8a79c5fb
(cherry picked from commit fb4ccef1df )
2015-05-05 18:22:03 -07: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
Tao Bao
38fcdfe06c
am 93cec9a0: Keep multiple kernel logs
...
* commit '93cec9a0c402d6ca5d41e10db738bb5f61b19be2':
Keep multiple kernel logs
2015-05-05 21:49:51 +00: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