Commit graph

1225 commits

Author SHA1 Message Date
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
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
0e3781ef9a Merge "Rewritten file pager." 2015-04-11 20:29:47 +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
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
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
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
51697d2781 Merge "Switch minadb over to C++." 2015-04-10 21:28:46 +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
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
6b0dd1d7e1 Merge "Move "Mount /system" to the main menu." 2015-04-10 17:20:04 +00:00
Elliott Hughes
ec28340cf3 Move "Mount /system" to the main menu.
Everyone's adding secret key combinations for this anyway, and it's
very useful when debugging.

Change-Id: Iad549452b872a7af963dd649f283ebcd3ea24234
2015-04-10 10:01:53 -07:00
Elliott Hughes
18eaa0cfe7 Merge "Add ev_iterate_available_keys to minui." 2015-04-10 16:58:48 +00:00
Elliott Hughes
0713819fd2 Add ev_iterate_available_keys to minui.
This lets us recognize whether we have up/down/power, say, and tailor
the UI accordingly.

Change-Id: If94e454f14243b59d2f473ac9a436bd60591da01
2015-04-10 09:40:53 -07:00
Elliott Hughes
f471861e83 Merge "Move the recovery image version out of the menu header." 2015-04-10 16:25:32 +00:00
Elliott Hughes
bb78d6286d Move the recovery image version out of the menu header.
Rather than add code to wrap menu items, let's just put output the
recovery version to the log. It'll be visible at the bottom of the
screen and automatically wrap.

Change-Id: I158fe2d85bc56b195e00619fba455321743923bd
2015-04-09 20:51:08 -07:00
Elliott Hughes
e001074f22 Merge "Move default implementations into Device." 2015-04-09 22:53:36 +00:00
Elliott Hughes
06522ef517 Merge "Remove some commented-out code." 2015-04-09 21:02:22 +00:00
Elliott Hughes
9e7ae8a626 Move default implementations into Device.
The current abstract class was a nice idea but has led to a lot of
copy & paste in practice. Right now, no one we know of has any extra
menu items, so let's make the default menu available to everyone.

(If we assume that someone somewhere really does need custom
device-specific menu options, a better API would let them add to
our menu rather than replacing it.)

Change-Id: I59f6a92f3ecd830c2ce78ce9da19eaaf472c5dfa
2015-04-09 13:40:31 -07:00
Elliott Hughes
42c12306c9 Remove some commented-out code.
Change-Id: Ifb466ee2a89da88832c04086fa43da2b8409c232
2015-04-09 11:50:56 -07:00
Elliott Hughes
52222a5841 Merge "Move file paging into ScreenRecoveryUI." 2015-04-09 18:24:45 +00:00
Elliott Hughes
8de52078a4 Move file paging into ScreenRecoveryUI.
This fixes the N9 performance problem.

Change-Id: I00c10d4162ff266a6243285e5a5e768217f6f799
2015-04-08 20:06:50 -07:00
Elliott Hughes
fbde407e4c Merge "Enable printf format argument checking." 2015-04-09 00:22:36 +00:00
Elliott Hughes
018ed31c51 Enable printf format argument checking.
The original attempt missed the fact that Print is a member function,
so the first argument is the implicit 'this'.

Change-Id: I963b668c5432804c767f0a2e3ef7dea5978a1218
2015-04-08 16:56:17 -07:00
Elliott Hughes
900c9a61de Merge "Remove the fixed screen size assumptions." 2015-04-08 23:18:04 +00:00
Elliott Hughes
aa0d6afb61 Remove the fixed screen size assumptions.
Dynamically allocate the text and menu arrays instead.

Change-Id: Idbfc3fe4e4b50db4fee62ac2b6a7323cad369749
2015-04-08 16:16:52 -07:00
Elliott Hughes
64346eae51 Merge "Remove a couple of unused inlines from minzip/Zip.h." 2015-04-08 22:18:14 +00:00
Elliott Hughes
9ad9d66f81 Remove a couple of unused inlines from minzip/Zip.h.
Change-Id: I805883e3863673416898bdef39c5703ca33f18e0
2015-04-08 12:08:32 -07:00
Tao Bao
ca7bf53189 Merge "Rotate logs only when there are actual operations" 2015-04-08 16:35:48 +00:00
Tao Bao
682c34bbc3 Rotate logs only when there are actual operations
Currently it rotates the log files every time it boots into the recovery
mode. We lose useful logs after ten times. This CL changes the rotation
condition so that it will rotate only if it performs some actual
operations that modify the flash (installs, wipes, sideloads and etc).

Bug: 19695622
Change-Id: Ie708ad955ef31aa500b6590c65faa72391705940
2015-04-07 22:02:27 -07:00
Tao Bao
6896f9d47d Merge "always use volume mount option when mounting a partition" 2015-03-31 23:56:02 +00:00
Tao Bao
ccc82eca9a Merge "Refactor the codes to call wipe_data/wipe_cache functions" 2015-03-31 23:39:44 +00:00
Tao Bao
e39a9bc722 Refactor the codes to call wipe_data/wipe_cache functions
It also changes the return type of wipe_data/wipe_cache to bool, so the
caller can get the status accordingly.

Change-Id: I3022dcdadd6504dac757a52c2932d1176ffd1918
2015-03-31 12:45:12 -07:00
Tao Bao
9295980ac1 Merge "Revert "Erase PST partition if its marked to be erased."" 2015-03-31 17:25:21 +00:00
Andres Morales
c277762de1 Revert "Erase PST partition if its marked to be erased."
This now gets done at the framework level.
Doing it here breaks the signature on the partition.

This reverts commit ee19387905.

Bug: 19967123
Change-Id: I2a977cb0f0ba94defa1bf9091219398ddc1d3528
(cherry picked from commit 037444642b)
2015-03-31 09:48:50 -07:00
Tao Bao
20e82d4fb6 Merge "Add support to enter sideload mode directly" 2015-03-31 01:00:47 +00:00
Tao Bao
c679f93da3 Add support to enter sideload mode directly
When the command file contains "--sideload" (as a result of 'adb reboot
sideload'), it goes into sideload mode directly. Text display will be
turned on by default. It waits for user interaction upon finishing.

When the command file contains "--sideload_auto_reboot", it enters
sideload mode silently. And it will reboot after the installation
regardless of its result, which is designed for automated testing purpose.

Change-Id: Ifdf173351221c7bbf635cfd32463b48e1fff5740
2015-03-30 14:13:18 -07:00
Elliott Hughes
dac2486514 Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too." 2015-03-25 23:56:49 +00:00
Elliott Hughes
30694c9e2f Factor out the "yes/no" menu and use it for "Wipe cache" too.
It's surprising that only one of the wipe options asks for confirmation.
This change makes it easier to add confirmation to any action.

I've also removed the version information from all but the main menu,
because I find I'm not really reading the red text because there's
so much of it all the time.

(Given that fingerprints are long and menu items aren't wrapped, we
might want to go with an actual "About" menu item instead.)

Change-Id: I7d809fdd53f9af32efc78bee618f98a69883fffe
2015-03-25 16:49:01 -07:00
Tao Bao
43b8081028 Merge "Factor out option variables from int to bool types" 2015-03-25 23:40:58 +00:00
Tao Bao
145d861460 Factor out option variables from int to bool types
Change-Id: Ia897aa43e44d115bde6de91789b35723826ace22
2015-03-25 15:56:15 -07:00
Elliott Hughes
e31f956597 Merge "Remove support for Cupcake kernels." 2015-03-24 23:31:07 +00:00