Commit graph

1437 commits

Author SHA1 Message Date
Elliott Hughes
f471861e83 Merge "Move the recovery image version out of the menu header." 2015-04-10 16:25:32 +00:00
Elliott Hughes
a9dfd59c83 am 7b66aaeb: am e001074f: Merge "Move default implementations into Device."
* commit '7b66aaebefb64e75597b33dbfac90072a8e32e9b':
  Move default implementations into Device.
2015-04-10 04:32:56 +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
7b66aaebef am e001074f: Merge "Move default implementations into Device."
* commit 'e001074f227fb74f6ebf5b26c222d09fe69712c0':
  Move default implementations into Device.
2015-04-09 22:59:07 +00:00
Elliott Hughes
e001074f22 Merge "Move default implementations into Device." 2015-04-09 22:53:36 +00:00
Elliott Hughes
061fe46c09 am 0c23c97c: am 06522ef5: Merge "Remove some commented-out code."
* commit '0c23c97c78211bc98c3dadd7f613e764e183a0ea':
  Remove some commented-out code.
2015-04-09 21:31:50 +00:00
Elliott Hughes
0c23c97c78 am 06522ef5: Merge "Remove some commented-out code."
* commit '06522ef517196062299852d59593eba0ea2be3c0':
  Remove some commented-out code.
2015-04-09 21:10:39 +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
9e225cb803 am 382ec478: am 52222a58: Merge "Move file paging into ScreenRecoveryUI."
* commit '382ec478d1ed1576d25d51205a1c67b190174172':
  Move file paging into ScreenRecoveryUI.
2015-04-09 19:06:25 +00:00
Elliott Hughes
42c12306c9 Remove some commented-out code.
Change-Id: Ifb466ee2a89da88832c04086fa43da2b8409c232
2015-04-09 11:50:56 -07:00
Elliott Hughes
382ec478d1 am 52222a58: Merge "Move file paging into ScreenRecoveryUI."
* commit '52222a58417e7e6349e91e19e4f5e293a3a971c5':
  Move file paging into ScreenRecoveryUI.
2015-04-09 18:31:53 +00: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
4c035efb55 am 36640972: am fbde407e: Merge "Enable printf format argument checking."
* commit '36640972b04c0b91207583e35f78acded4a28190':
  Enable printf format argument checking.
2015-04-09 01:03:29 +00:00
Elliott Hughes
bab7b2111b am 0d4f2b6d: am 900c9a61: Merge "Remove the fixed screen size assumptions."
* commit '0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4':
  Remove the fixed screen size assumptions.
2015-04-09 01:03:29 +00:00
Elliott Hughes
9e0d0c7c91 am 72ba6264: am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h."
* commit '72ba6264468573c21cc6bade65172be549f5b034':
  Remove a couple of unused inlines from minzip/Zip.h.
2015-04-09 01:03:27 +00:00
Elliott Hughes
36640972b0 am fbde407e: Merge "Enable printf format argument checking."
* commit 'fbde407e4c72965aae4ea6dff7493e30af307ca5':
  Enable printf format argument checking.
2015-04-09 00:31:27 +00:00
Elliott Hughes
0d4f2b6d9a am 900c9a61: Merge "Remove the fixed screen size assumptions."
* commit '900c9a61dee1511c9f4086ea5a3a3632b944cc0e':
  Remove the fixed screen size assumptions.
2015-04-09 00:31:26 +00: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
72ba626446 am 64346eae: Merge "Remove a couple of unused inlines from minzip/Zip.h."
* commit '64346eae51861356f8bf0f50e68dfeb9e1d04052':
  Remove a couple of unused inlines from minzip/Zip.h.
2015-04-08 23:27:07 +00: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
264d26a2d8 am 0a7c1694: am ca7bf531: Merge "Rotate logs only when there are actual operations"
* commit '0a7c16948b9750c0c063676cefce1f1354f9c971':
  Rotate logs only when there are actual operations
2015-04-08 17:12:02 +00:00
Tao Bao
0a7c16948b am ca7bf531: Merge "Rotate logs only when there are actual operations"
* commit 'ca7bf53189c70ef0f687d54d772e5eaadc0b1c7c':
  Rotate logs only when there are actual operations
2015-04-08 16:45:17 +00: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
Andres Morales
c94fa0b01b DO NOT MERGE 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: I447b926b733ca145f11a916d9569ce39889db627
2015-04-01 22:43:35 +00:00
Tao Bao
2702e011aa am 575e3739: am 6896f9d4: Merge "always use volume mount option when mounting a partition"
* commit '575e37394ec9dc2ff0b098c7a6fe8e3f95c4808f':
  always use volume mount option when mounting a partition
2015-04-01 02:32:26 +00:00
Tao Bao
a011896e5e am 8cd389c8: am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions"
* commit '8cd389c80568ff46c18c7f7a59396562a6cf7f59':
  Refactor the codes to call wipe_data/wipe_cache functions
2015-04-01 02:32:25 +00:00
Tao Bao
575e37394e am 6896f9d4: Merge "always use volume mount option when mounting a partition"
* commit '6896f9d47db1f959a907d2e67e55860af23e65f8':
  always use volume mount option when mounting a partition
2015-04-01 01:27:37 +00:00
Tao Bao
8cd389c805 am ccc82eca: Merge "Refactor the codes to call wipe_data/wipe_cache functions"
* commit 'ccc82eca9a9b63f43c69472c0841954f19f7a7f0':
  Refactor the codes to call wipe_data/wipe_cache functions
2015-04-01 01:27:36 +00: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
938e36c8b2 am 9e1bba1f: am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""
* commit '9e1bba1f5f53f366bfec995a89e362c3b897cb37':
  Revert "Erase PST partition if its marked to be erased."
2015-03-31 17:47:29 +00:00
Tao Bao
9e1bba1f5f am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""
* commit '9295980ac1554ff7c30531298aadec0750b027e0':
  Revert "Erase PST partition if its marked to be erased."
2015-03-31 17:29:39 +00: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
17b2afc1f3 resolved conflicts for merge of 5472176c to master
Change-Id: Ib2395d806bb8c029f7743c36cb7849e5589fad7b
2015-03-30 18:59:50 -07:00
Tao Bao
5472176c86 am 20e82d4f: Merge "Add support to enter sideload mode directly"
* commit '20e82d4fb6b4ba8520bd46db2982495f0b627ed1':
  Add support to enter sideload mode directly
2015-03-31 01:07:09 +00: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
Andres Morales
037444642b 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: I447b926b733ca145f11a916d9569ce39889db627
2015-03-30 20:58:35 +00:00
Elliott Hughes
65ae9e1ea6 am dac24865: Merge "Factor out the "yes/no" menu and use it for "Wipe cache" too."
* commit 'dac2486514ef7b794610e929fd5615d98c9c1932':
  Factor out the "yes/no" menu and use it for "Wipe cache" too.
2015-03-26 03:47:03 +00:00
Tao Bao
dfe34afed6 am 43b80810: Merge "Factor out option variables from int to bool types"
* commit '43b80810284bd0eb43a4488044f902c910c9f3b2':
  Factor out option variables from int to bool types
2015-03-26 03:47:02 +00: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