Commit graph

846 commits

Author SHA1 Message Date
Riley Andrews
e8d7dd4ed1 am 3e0fc39e: am 974fe112: Merge "Fix recovery mode."
* commit '3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6':
  Fix recovery mode.
2014-06-25 00:44:02 +00:00
Riley Andrews
3e0fc39ec2 am 974fe112: Merge "Fix recovery mode."
* commit '974fe112ae6df95ca6d49688d6e3e459d87e16de':
  Fix recovery mode.
2014-06-25 00:40:46 +00:00
Colin Cross
22bcf97a59 recovery: enable panic_on_oops
Set panic_on_oops=1 to reboot if the kernel panics.

Change-Id: Id9e8689a570229db2ea2a3d72b52784f8a1ed107
2014-06-24 13:43:39 -07:00
Riley Andrews
974fe112ae Merge "Fix recovery mode." 2014-06-24 18:00:13 +00:00
Riley Andrews
e739d7e6cd Fix recovery mode.
Duplicate changes made to init.rc for https://android-review.googlesource.com/98852
in the init.rc used for recovery mode.

Bug 15849856

Change-Id: Ia376ddf6373a28718653f7fb1435bf7ecb33d813
2014-06-24 17:11:10 -07:00
Ji-Hwan Lee
b9afc2bf15 Use LOCAL_REQUIRED_MODULES for mkfs.f2fs
Instead of LOCAL_ADDITIONAL_DEPENDENCIES.

Bug: 15702524
Change-Id: Ic152ae60354bf09eccdb9a85dcd04f0f076a6422
2014-06-18 17:30:14 +00:00
JP Abgrall
37aedb3faf Support F2FS for the data partition
This adds F2FS support
- for wiping a device
- for the install "format" command.

Note: crypto data in "footer" with a default/negative length
is not supported, unlike with "ext4".

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-16 19:07:39 -07:00
Joey Pan
ba545d7e23 minui: avoid random screen frame at startup
Clear framebuffer at init.

[toddpoynor@google.com: forward port]
Change-Id: Ie98c7724cd974dcacef3e3559a6fe492864a5e72
2014-06-12 11:06:52 -07:00
Doug Zongker
43772d26a5 advance progress bar during block OTA installations
While executing syspatch and package_extract_file() calls with don't
care maps (both of which are used to rewrite the system image in
incremental and full block OTAs, respectively), pass a progress
callback in and use it to update the visible progress bar.

Change-Id: I1d3742d167c1bb2130571eb5103b7795c65ff371
2014-06-09 14:15:22 -07:00
Doug Zongker
3fa26c9fa2 am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGE
* commit 'dff8afe1b21c6ffe09269434f9f8f0d166e1a848':
  restore holo UI in recovery -- DO NOT MERGE
2014-06-06 16:27:57 +00:00
Doug Zongker
9a5f58427a Merge "restore holo UI in recovery" 2014-06-06 16:03:04 +00:00
Doug Zongker
5b5f6c2fd3 restore holo UI in recovery
Return to the recovery to the holo appearance.

Bug: 15424396
Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
2014-06-06 09:01:57 -07:00
Doug Zongker
ad07492046 am 54a61179: am cfd4b286: Merge "recovery: initialize keys press tracking status"
* commit '54a6117935fe7470d23f7a538aeec9d6b139791b':
  recovery: initialize keys press tracking status
2014-06-06 16:00:20 +00:00
Doug Zongker
54a6117935 am cfd4b286: Merge "recovery: initialize keys press tracking status"
* commit 'cfd4b2864534f062a01730d81b2cd7e054087e8f':
  recovery: initialize keys press tracking status
2014-06-06 15:55:57 +00:00
Doug Zongker
cfd4b28645 Merge "recovery: initialize keys press tracking status" 2014-06-06 15:33:16 +00:00
Mihai Serban
187d626e61 recovery: initialize keys press tracking status
Checks for keys pressed return random results because of an uninitialized data
structure.

Change-Id: Ic8b3d453d62347921aa893403079b374c16a092e
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
2014-06-06 15:23:20 +03:00
Doug Zongker
dff8afe1b2 restore holo UI in recovery -- DO NOT MERGE
Since we don't have quantum assets for recovery yet, go back to the
holo appearance (dark background, blue glowing progress bar) for
lmp-preview.

Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
2014-06-03 11:02:31 -07:00
Doug Zongker
c704e06ce5 disable async reboot during package installation
The default recovery UI will reboot the device when the power key is
pressed 7 times in a row, regardless of what recovery is doing.
Disable this feature during package installation, to minimize the
chance of corrupting the device due to a mid-install reboot.  (Debug
packages can explicitly request that the feature be reenabled.)

Change-Id: I20f3ec240ecd344615d452005ff26d8dd7775acf
2014-05-23 08:52:31 -07:00
Doug Zongker
ffb557d351 am 502e4595: am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"
* commit '502e45957420484eec2367e7580e9bec96605c5d':
  exit instead of return if sideload file creation fails
2014-05-16 17:49:39 +00:00
Doug Zongker
502e459574 am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"
* commit 'd1c64060abf8a56a259c0913244448fdba245f6c':
  exit instead of return if sideload file creation fails
2014-05-16 17:48:04 +00:00
Doug Zongker
d1c64060ab am 5fbb729f: Merge "exit instead of return if sideload file creation fails"
* commit '5fbb729f3eb67c9bb59580f692a31e5c50e24e6d':
  exit instead of return if sideload file creation fails
2014-05-16 17:45:18 +00:00
Doug Zongker
5fbb729f3e Merge "exit instead of return if sideload file creation fails" 2014-05-16 17:42:12 +00:00
Doug Zongker
ddb1b74498 am c4804e9b: am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"
* commit 'c4804e9b9c143652d17441b4b672b920b11cc94a':
  fix vulnerability in bspatch
2014-05-16 15:09:35 +00:00
Doug Zongker
c4804e9b9c am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"
* commit 'd4592694b41d5f8309d98cd3312b5486216cc685':
  fix vulnerability in bspatch
2014-05-16 15:06:23 +00:00
Doug Zongker
d4592694b4 am 3ca99f6c: Merge "fix vulnerability in bspatch"
* commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd':
  fix vulnerability in bspatch
2014-05-16 15:03:24 +00:00
Doug Zongker
3ca99f6cb8 Merge "fix vulnerability in bspatch" 2014-05-16 14:58:33 +00:00
Doug Zongker
eed6483638 am 0766cdf4: am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"
* commit '0766cdf49acb77677864995e931eec391243505d':
  Support BGRA framebuffer
2014-05-13 22:24:06 +00:00
Doug Zongker
0766cdf49a am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"
* commit 'd2fb4ed58997afd18bd2b5274bf1835644d454fb':
  Support BGRA framebuffer
2014-05-13 22:19:37 +00:00
Doug Zongker
d2fb4ed589 am d27aa76a: Merge "Support BGRA framebuffer"
* commit 'd27aa76a6ff6436cfb8340bf3d04aba186cc4de1':
  Support BGRA framebuffer
2014-05-13 22:15:14 +00:00
Doug Zongker
d27aa76a6f Merge "Support BGRA framebuffer" 2014-05-13 22:09:40 +00:00
Daniel Leung
f766396d99 Support BGRA framebuffer
The re-designed recovery graphics code only supports RGB{_,X,A}
framebuffer, and this patch adds support for BGRA framebuffer.

Change-Id: I3780c8288088f497fa248f3492c54f43834a8598
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com>
Tested-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
2014-05-13 15:00:40 -07:00
Doug Zongker
8c7457a2c5 am 48abd574: am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"
* commit '48abd574cb1b7b0adbe1de36224fb974182aaa2d':
  screen_ui: Initialize text buffer
2014-05-13 17:38:15 +00:00
Doug Zongker
48abd574cb am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"
* commit '34ff5fe3f59abfb1984189ade32059cc47bf97e5':
  screen_ui: Initialize text buffer
2014-05-13 17:31:51 +00:00
Doug Zongker
34ff5fe3f5 am 74b90b30: Merge "screen_ui: Initialize text buffer"
* commit '74b90b309f67dc3b8bb74e47c4eddf7ce511bc35':
  screen_ui: Initialize text buffer
2014-05-13 17:28:54 +00:00
Doug Zongker
74b90b309f Merge "screen_ui: Initialize text buffer" 2014-05-13 17:25:52 +00:00
Doug Zongker
4aa12dd0de fix vulnerability in bspatch
Patches with control data tuples with negative numbers in the first
and/or second can cause bspatch to write to arbitrary locations in the
heap.

Change-Id: I8c5d81948be773e6483241131d3d166b6da27cb8
2014-05-13 08:40:49 -07:00
Michael Runge
f5d9f89152 Allow 0-byte files in full OTAs.
Currently, the writeProcessFunction fails when
there are zero bytes to write, potentially returning
errno from a previous operation, or hanging
indefinitely while it waits for a >0 result on a
write of size 0.  This happens when the output
file is intended to be zero bytes in size.

Change-Id: Ib3cfcaf66d82942bc89e5f5c64697862403b38da
2014-05-09 18:09:28 +00:00
Greg Hackmann
64e7fcd925 am e9f9238a: am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"
* commit 'e9f9238af83f949dc000667356eba025e1241a2f':
  recovery: minui: add adf backend
2014-05-02 23:26:42 +00:00
Greg Hackmann
e9f9238af8 am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"
* commit '1cd5242349bb1ef10eca76ff2c3e17415aecdf9d':
  recovery: minui: add adf backend
2014-05-02 23:23:14 +00:00
Greg Hackmann
1cd5242349 am 1c2cf1db: Merge "recovery: minui: add adf backend"
* commit '1c2cf1db0db2c9e9310d27bdc19c605f5537b72f':
  recovery: minui: add adf backend
2014-05-02 23:20:14 +00:00
Greg Hackmann
1c2cf1db0d Merge "recovery: minui: add adf backend" 2014-05-02 23:15:54 +00:00
Michael Runge
aa1a31e83d Allow lines without = signs.
The new build.prop for Sprout includes lines of the format:
import xxx.prop

These can be safely ignored when reading the property file.

Change-Id: Ia84a138e71461ffe8e591e88143b9787873def29
2014-05-01 18:37:40 -07:00
Bill Yi
ff5fc6c809 am ddaaccb3: am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD
* commit 'ddaaccb3db623ff6f19b7dadf51d41cc46bb05c3':
2014-04-30 00:52:59 +00:00
Bill Yi
ddaaccb3db am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD
* commit '29759e9d518880adba366c502cf79d53c48a31bb':
2014-04-30 00:49:24 +00:00
Bill Yi
29759e9d51 Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEAD 2014-04-29 11:32:53 -07:00
Greg Hackmann
41909ddefb recovery: minui: add adf backend
Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-04-25 15:47:34 -07:00
Benoit Goby
5ec6f4daaf am 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10
* commit '9e8d81ba96b299cc084723797d9f492d4441d57a':
  recovery: Fix adb with linux 3.10
2014-04-18 19:16:11 +00:00
Benoit Goby
9e8d81ba96 am 0e22af65: recovery: Fix adb with linux 3.10
* commit '0e22af658c89fb53ab1215a3538bbaf10d733ad9':
  recovery: Fix adb with linux 3.10
2014-04-18 19:12:40 +00:00
Benoit Goby
0e22af658c recovery: Fix adb with linux 3.10
In kernel 3.10, f_adb has been removed and adbd can use functionfs
instead. Mount functionfs on boot for adbd. On older kernels, mount
will fail silently and adbd will revert to f_adb.

Bug: 14160609
Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
2014-04-18 12:05:30 -07:00
Sasha Levitskiy
346e11816d am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call."
* commit 'ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819':
  Change filesystem add entry API call.
2014-04-12 00:02:32 +00:00