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
Sami Tolvanen
43b748f254
Don't remove existing explicitly stashed blocks
...
When automatically stashing overlapping blocks, should the stash
file already exist due to an explicit stash command, it's not safe
to remove the stash file after the command has completed.
Note that it is safe to assume that the stash file will remain in
place during the execution of the next command, so we don't have
take other measures to preserve overlapping blocks.
The stash file itself will be removed by a free command when it's
no longer needed.
Bug: 20297065
Change-Id: I8ff1a798b94086adff183c5aac03260eb947ae2c
2015-04-17 13:07:08 +01:00
Tao Bao
51f42b2d20
am 4381767a: Merge "imgdiff: Avoid infinite loop if inflate fails"
...
* commit '4381767aa6410902e07376f62f66bbef83ebf2c4':
imgdiff: Avoid infinite loop if inflate fails
2015-04-16 21:06:00 +00:00
Tao Bao
4381767aa6
Merge "imgdiff: Avoid infinite loop if inflate fails"
2015-04-16 20:55:38 +00:00
Elliott Hughes
0a557b6bc2
am 7176a617: Merge "Don\'t use typedefs that hide *s."
...
* commit '7176a61718e7b45a8fde3a25eada0c9425d1dece':
Don't use typedefs that hide *s.
2015-04-15 18:36:32 +00:00
Elliott Hughes
7176a61718
Merge "Don't use typedefs that hide *s."
2015-04-15 18:26:37 +00:00
Elliott Hughes
0a5cb0c7cd
Don't use typedefs that hide *s.
...
gr_surface was causing confusion for no good reason.
Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
2015-04-15 10:58:56 -07:00
Elliott Hughes
98bfb6f797
am 6e435abf: Merge "Move the menu header out of the menu."
...
* commit '6e435abfeb7256b5ea82ca37166acf36e3f98085':
Move the menu header out of the menu.
2015-04-15 17:15:53 +00:00
Elliott Hughes
6e435abfeb
Merge "Move the menu header out of the menu."
2015-04-15 17:05:35 +00:00
Johan Redestig
c68bd34dc8
imgdiff: Avoid infinite loop if inflate fails
...
Break out of the loop if inflate returns an error
and print some details.
Change-Id: Ie157cf943291b1a26f4523b17691dfcefbc881dc
2015-04-15 13:09:54 +02:00
Elliott Hughes
8fd86d77f1
Move the menu header out of the menu.
...
This makes it easier for us to deal with arbitrary information at the
top, and means that headers added by specific commands don't overwrite
the default ones.
Add the fingerprint back, but broken up so it fits even on sprout's
display.
Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c
2015-04-13 15:46:15 -07:00
Elliott Hughes
cbdc7e844a
am 17b032e1: Merge "Add missing \n after "Mounting /system." message."
...
* commit '17b032e159779886f0151641a9aad5003debdce2':
Add missing \n after "Mounting /system." message.
2015-04-13 20:50:56 +00:00
Elliott Hughes
17b032e159
Merge "Add missing \n after "Mounting /system." message."
2015-04-13 20:40:52 +00:00
Elliott Hughes
e46066f269
Add missing \n after "Mounting /system." message.
...
Change-Id: I280a478526f033f5c0041d7e8a818fce6177d732
2015-04-13 13:29:38 -07:00
Elliott Hughes
d7823c5dfe
am eab12de7: Merge "Remove unnecessary globals."
...
* commit 'eab12de70efb649ab33f7971e948251895d613fe':
Remove unnecessary globals.
2015-04-13 20:24:42 +00:00
Elliott Hughes
507630e99c
am b68c4fc4: Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
...
* commit 'b68c4fc42617acb97dde89f501caf8558a348b51':
Treat KEY_ENTER the same as KEY_POWER in the pager.
2015-04-13 20:24:41 +00:00
Elliott Hughes
eab12de70e
Merge "Remove unnecessary globals."
2015-04-13 20:18:57 +00:00
Elliott Hughes
b68c4fc426
Merge "Treat KEY_ENTER the same as KEY_POWER in the pager."
2015-04-13 20:17:12 +00:00
Elliott Hughes
985022a623
Remove unnecessary globals.
...
Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
2015-04-13 13:04:32 -07:00
Elliott Hughes
300ed089b3
Treat KEY_ENTER the same as KEY_POWER in the pager.
...
Our long-press UI sends KEY_ENTER for long presses, which the long-press
UI treats as equivalent to KEY_POWER in the regular UI. So anywhere we accept
KEY_POWER we should accept KEY_ENTER too.
Change-Id: I99d376c961887043cf02037c26d000c8ba4d66f9
2015-04-13 10:47:59 -07:00
Elliott Hughes
d56e0f377e
am 0e3781ef: Merge "Rewritten file pager."
...
* commit '0e3781ef9af2df648f54eb2a7765bef7b6b5b22e':
Rewritten file pager.
2015-04-11 20:39:04 +00:00
Elliott Hughes
0e3781ef9a
Merge "Rewritten file pager."
2015-04-11 20:29:47 +00:00
Tao Bao
dd4d48be37
am 558ba1ba: Merge "Revert "Append kernel logs to last_log file""
...
* commit '558ba1bafa232935148b6483dc40277cdf4be292':
Revert "Append kernel logs to last_log file"
2015-04-11 02:30:13 +00:00
Tao Bao
558ba1bafa
Merge "Revert "Append kernel logs to last_log file""
2015-04-11 02:21:27 +00:00
Elliott Hughes
95fc63e87b
Rewritten file pager.
...
Most importantly, this one no longer skips lines because of wrapping.
Change-Id: Ic1c1944682ab8cbf3d542418ee86d29819173fc9
2015-04-10 19:12:01 -07:00
Tao Bao
f012432f96
Revert "Append kernel logs to last_log file"
...
This reverts commit 2ec803f435 .
Change-Id: I419025a772ef99db4c0a78bfa7ef66767f3fa062
2015-04-11 02:04:11 +00:00
Tao Bao
fa51b50ae7
am 464c3e71: Merge "Append kernel logs to last_log file"
...
* commit '464c3e718f4c52444d17ab66ab6c9f71936cd4b8':
Append kernel logs to last_log file
2015-04-11 01:19:58 +00:00
Tao Bao
464c3e718f
Merge "Append kernel logs to last_log file"
2015-04-11 01:12:24 +00:00
Tao Bao
2ec803f435
Append kernel logs to last_log file
...
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to append it to the recovery log.
Bug: 18092237
Change-Id: I06ad5629016846927153064f1663753a90296f79
2015-04-10 17:23:34 -07:00
Tao Bao
57ca725d87
am 6d1bd3d3: Merge "Update the comments for package installer commands"
...
* commit '6d1bd3d3d4f7e715b2692696eb75e1927a4cd954':
Update the comments for package installer commands
2015-04-10 23:59:56 +00:00
Tao Bao
6d1bd3d3d4
Merge "Update the comments for package installer commands"
2015-04-10 23:53:54 +00:00
Tao Bao
b07e1f3a3a
Update the comments for package installer commands
...
These commands are for the communication between the installer and the
update binary (edify interpreter). Update the comments in sync with the
codes.
Change-Id: I7390f022b1447049a974b0b45697ef1d2e71d4e0
2015-04-10 16:18:32 -07:00
Elliott Hughes
34bbc7d49a
am f19007a5: Merge "Auto-detect whether to use the long-press UI."
...
* commit 'f19007a5252d62020c3ac8796908d9ee4653830d':
Auto-detect whether to use the long-press UI.
2015-04-10 22:36:42 +00:00
Elliott Hughes
f19007a525
Merge "Auto-detect whether to use the long-press UI."
2015-04-10 22:28:57 +00:00
Elliott Hughes
4af215b2c3
Auto-detect whether to use the long-press UI.
...
Change-Id: Ie77a5584e301467c6a5e164d2c62d6f036b2c0c0
2015-04-10 15:14:35 -07:00
Elliott Hughes
a90ba39beb
am 51697d27: Merge "Switch minadb over to C++."
...
* commit '51697d2781501c30d8db6d2a8e6c2becebcffad8':
Switch minadb over to C++.
2015-04-10 21:41:15 +00:00
Elliott Hughes
51697d2781
Merge "Switch minadb over to C++."
2015-04-10 21:28:46 +00:00
Elliott Hughes
53b8ca4b72
am 23017c5d: Merge "Switch minui over to C++."
...
* commit '23017c5d5c145a1040ee49466d30489d6e11bb61':
Switch minui over to C++.
2015-04-10 21:03:53 +00:00
Elliott Hughes
20531ef605
Switch minadb over to C++.
...
Change-Id: I5afaf70caa590525627c676c88b445d3162de33e
2015-04-10 13:59:19 -07:00
Elliott Hughes
23017c5d5c
Merge "Switch minui over to C++."
2015-04-10 20:57:37 +00:00
Elliott Hughes
07cfb8fe79
Switch minui over to C++.
...
Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01
2015-04-10 13:42:55 -07:00
Elliott Hughes
9b0ebf992e
am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."
...
* commit '5d1630a926a02ca13a66eb1e385eabba16b04cfc':
Fix ScreenRecoveryUI to handle devices without power/up/down.
2015-04-10 20:32:34 +00:00
Elliott Hughes
5d1630a926
Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."
2015-04-10 20:26:53 +00:00
Elliott Hughes
642aaa7a3e
Fix ScreenRecoveryUI to handle devices without power/up/down.
...
Currently fugu has a custom subclass to handle this. The default code
supports devices with trackballs but not all shipping Nexus devices?
That's just silly.
Change-Id: Id2779c91284899a26b4bb1af41e7033aa889df10
2015-04-10 12:47:46 -07:00
Elliott Hughes
c22f5774d0
am 6b0dd1d7: Merge "Move "Mount /system" to the main menu."
...
* commit '6b0dd1d7e1e1f3645230f880db95cad1279a826b':
Move "Mount /system" to the main menu.
2015-04-10 17:28:24 +00:00
Elliott Hughes
6b0dd1d7e1
Merge "Move "Mount /system" to the main menu."
2015-04-10 17:20:04 +00:00