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
Elliott Hughes
dbb20c4863
Fix mips64 minadbd_test build.
...
Looks like the mips64 linker isn't as good as the others at GCing
unused stuff, which means it needs libcutils.
Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702
2015-05-01 22:29:01 -07:00
Elliott Hughes
c0537d6885
am 6bc2d538: Merge "Move minadb over to new API."
...
* commit '6bc2d538ae304edbd6bf514cb61444844313032d':
Move minadb over to new API.
2015-05-02 00:39:16 +00:00
Elliott Hughes
c67e89ada5
am 30cea3dc: Merge "Fix minadb_test build breakage."
...
* commit '30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9':
Fix minadb_test build breakage.
2015-05-02 00:39:15 +00:00
Elliott Hughes
6bc2d538ae
Merge "Move minadb over to new API."
2015-05-02 00:34:42 +00:00
Elliott Hughes
30cea3dcaf
Merge "Fix minadb_test build breakage."
2015-05-02 00:26:00 +00:00
Elliott Hughes
3e7d82c621
Fix minadb_test build breakage.
...
Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03
2015-05-01 17:25:24 -07:00
Elliott Hughes
4039933c62
Move minadb over to new API.
...
Change-Id: I889bcf2222245c7665287513669cae8831e37081
2015-05-01 17:07:44 -07:00
Elliott Hughes
34d3a3d074
am 34c7731a: Merge "Check all lseek calls succeed."
...
* commit '34c7731a0bb296a1289b85a83f53026117aa3677':
Check all lseek calls succeed.
2015-04-30 04:19:33 +00:00
Elliott Hughes
34c7731a0b
Merge "Check all lseek calls succeed."
2015-04-30 04:11:41 +00:00
Elliott Hughes
7bad7c4646
Check all lseek calls succeed.
...
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.
Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
2015-04-29 17:46:43 -07:00
Elliott Hughes
bc4e69fc28
am 8c389e9c: Merge "Stop using adb_strtok, and check argument validity."
...
* commit '8c389e9c769c8632cf16c0794f1e84f49996077c':
Stop using adb_strtok, and check argument validity.
2015-04-28 18:03:22 +00:00
Elliott Hughes
8c389e9c76
Merge "Stop using adb_strtok, and check argument validity."
2015-04-28 17:52:17 +00:00
Elliott Hughes
ba45ddf37c
Stop using adb_strtok, and check argument validity.
...
Change-Id: I323ffda71b82cc939aed446f9c9fb86ca78df153
2015-04-28 09:40:19 -07:00
Elliott Hughes
5a95719bd9
am 6725ebc7: Merge "Revert "Revert "init re-execs to set its security context now."""
...
* commit '6725ebc7b41ae0702adb28d9b40fbd392c6bfb9a':
Revert "Revert "init re-execs to set its security context now.""
2015-04-24 20:39:15 +00:00
Elliott Hughes
6725ebc7b4
Merge "Revert "Revert "init re-execs to set its security context now."""
2015-04-24 20:29:34 +00:00
Elliott Hughes
6f76dd58f4
Revert "Revert "init re-execs to set its security context now.""
...
This reverts commit c819dbe95b .
Bug: http://b/19702273
Change-Id: I5c75b148a12e644dd247a4df4f67dc9b4b9ff8cf
2015-04-24 12:42:46 -07:00
Nick Kralevich
f6c03a80f0
am c690332c: Merge "Revert "init re-execs to set its security context now.""
...
* commit 'c690332c5e4008d0f58d7a356311a821ef07d0cf':
Revert "init re-execs to set its security context now."
2015-04-24 17:05:48 +00:00
Nick Kralevich
c690332c5e
Merge "Revert "init re-execs to set its security context now.""
2015-04-24 16:59:11 +00:00
Nick Kralevich
c819dbe95b
Revert "init re-execs to set its security context now."
...
shamu isn't booting now
This reverts commit c57453d537 .
Change-Id: I8efbf6260f5fcf983e5056fac6d03916415b944e
2015-04-24 16:58:33 +00:00
Elliott Hughes
7058b89f02
am 38a82cac: Merge "init re-execs to set its security context now."
...
* commit '38a82cace581a888c5bc475754a20d8e92992fb2':
init re-execs to set its security context now.
2015-04-24 03:34:40 +00:00
Elliott Hughes
38a82cace5
Merge "init re-execs to set its security context now."
2015-04-24 03:27:53 +00:00
Elliott Hughes
c57453d537
init re-execs to set its security context now.
...
Change-Id: I0a014f8dddfe775159903b5d6fa632733fef692c
2015-04-23 20:26:56 -07:00
Sami Tolvanen
0391820cde
am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"
...
* commit '0de2351e6a6be685e1d68661dcf5f4902898cacd':
Don't remove existing explicitly stashed blocks
2015-04-17 17:02:43 +00:00
Sami Tolvanen
0de2351e6a
Merge "Don't remove existing explicitly stashed blocks"
2015-04-17 16:54:34 +00:00