PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
725 Commits 1 Branch 0 Tags
28ffde5ebd33d5b693906a93087e6eea627cd8d0
Commit Graph

725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
28ffde5ebd Merge "Revert "Copy epoll(2) changes to minadb."" 2014-09-26 16:04:16 +00:00
Dan Albert
f420f8eb63 Revert "Copy epoll(2) changes to minadb." 
This reverts commit db8c959049.
 2014-09-25 15:12:19 -07:00
Elliott Hughes
530b61e0b5 Merge "Copy epoll(2) changes to minadb." 2014-09-23 18:36:34 +00:00
Elliott Hughes
db8c959049 Copy epoll(2) changes to minadb. 
Bug: 17588403
Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2
 2014-09-23 10:50:55 -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
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
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
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
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
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
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
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
Sasha Levitskiy
558f2700e1 Merge "Change filesystem add entry API call." 2014-04-11 23:54:14 +00:00
Sasha Levitskiy
85ef47dd84 Change filesystem add entry API call. 
Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee

Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2014-04-11 21:13:26 +00:00
Doug Zongker
25c2b2f670 am aa4545b5: Merge "restore minui support for paletted images with < 8 bits" 
* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
  restore minui support for paletted images with < 8 bits
 2014-03-20 16:31:14 +00:00
Doug Zongker
aa4545b5ae Merge "restore minui support for paletted images with < 8 bits" 2014-03-20 15:28:32 +00:00
Doug Zongker
577a130435 restore minui support for paletted images with < 8 bits 
The PNG image loaders should support images that use palettes
requiring fewer than 8 bits.

Change-Id: Ibcb0ff6f04aea8de54b03c0efa7a79e9b3635146
 2014-03-20 08:27:01 -07:00
Doug Zongker
a7d211c6ad resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp 
Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
 2014-03-18 10:54:31 -07:00
Doug Zongker
708aa23801 Merge "add --shutdown_after option to recovery" 2014-03-18 17:39:10 +00:00
Doug Zongker
b1d1263453 add --shutdown_after option to recovery 
The "--shutdown_after" option causes recovery to power down the device
on completion rather than rebooting.

Removes the last vestiges of the "--previous_runs" argument, which
doesn't seem to be used for anything.

Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
 2014-03-18 10:32:12 -07:00
Doug Zongker
2b3737224e am 130a7985: Merge "fix error log statement" 
* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
  fix error log statement
 2014-03-17 23:57:40 +00:00
Doug Zongker
130a798538 Merge "fix error log statement" 2014-03-17 23:52:35 +00:00
Doug Zongker
a388a76976 fix error log statement 
We were printing the address of channels instead of the value there.

Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
 2014-03-17 16:51:47 -07:00
Doug Zongker
c4025e90f4 resolved conflicts for merge of d90da130 to klp-dev-plus-aosp 
Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
 2014-03-17 16:13:08 -07:00
Doug Zongker
d90da13076 Merge "refactor image resource loading code in minui" 2014-03-17 22:56:47 +00:00
Doug Zongker
a418aa7dd5 refactor image resource loading code in minui 
Reduce the number of copies of libpng boilerplate.  Rename
res_create_* functions to be more clear.  Make explicit the use of the
framebuffer pixel format for images, and handle more combinations of
input and output (eg, loading a grayscale image for display rather
than use as a text alpha channel).

Change-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846
 2014-03-17 12:27:08 -07:00
Mark Salyzyn
52d0b765ab am 026ebe02: Merge "Recovery 64-bit compile issues" 
* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
  Recovery 64-bit compile issues
 2014-03-14 21:02:33 +00:00
Mark Salyzyn
026ebe0214 Merge "Recovery 64-bit compile issues" 2014-03-14 20:53:41 +00:00
Mark Salyzyn
f3bb31c32f Recovery 64-bit compile issues 
Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
 2014-03-14 13:51:39 -07:00
Doug Zongker
d6e6303df4 am a7266ef0: Merge "separate fbdev-specific code out from minui" 
* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
  separate fbdev-specific code out from minui
 2014-03-13 15:46:53 +00:00
Doug Zongker
4048200cd6 am c91612d4: Merge "remove pixelflinger from recovery" 
* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
  remove pixelflinger from recovery
 2014-03-13 15:46:53 +00:00
Doug Zongker
546f357d03 am 8f087d02: Merge "update tools for making recovery images" 
* commit '8f087d024619467de8609656e8a14370f24b817c':
  update tools for making recovery images
 2014-03-13 15:46:53 +00:00
Doug Zongker
8e7bccd9a4 am 59508993: Merge "allow CheckKey to request mounting /system" 
* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
  allow CheckKey to request mounting /system
 2014-03-13 15:46:52 +00:00
Doug Zongker
cfcec9e1d4 Merge commit 'ea868b38' into manualmerge 
Conflicts:
	screen_ui.cpp
	screen_ui.h

Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
 2014-03-13 08:44:07 -07:00
Doug Zongker
a7266ef0b1 Merge "separate fbdev-specific code out from minui" 2014-03-11 23:02:49 +00:00
Doug Zongker
5290f2087a separate fbdev-specific code out from minui 
Isolate the code that interacts with fbdev, in preparation for adding
a new backend.

Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
 2014-03-11 14:56:41 -07:00
Doug Zongker
c91612d466 Merge "remove pixelflinger from recovery" 2014-03-11 21:55:48 +00:00
Doug Zongker
16f97c3961 remove pixelflinger from recovery 
Recovery now draws directly to the framebuffer by rolling its own
graphics code, rather than depending on libpixelflinger.

The recovery UI is modified slightly to eliminate operations that are
slow with the software implementation: when the text display / menu is
turned on, it now appears on a black background instead of a dimmed
version of the recovery icon.

There's probably substantial room for optimization of the graphics
operations.

Bug: 12131110
Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595

Conflicts:
	minui/resources.c
 2014-03-11 14:40:04 -07:00
Doug Zongker
8f087d0246 Merge "update tools for making recovery images" 2014-03-11 21:34:32 +00:00
Doug Zongker
3ceeb580eb update tools for making recovery images 
We no longer render animations as a base image with a
possibly-partially-transparent overlay drawn over it, so delete the
make-overlay.py tool.  Now we represent them as series of images that
are interlaced by row (with a special text chunk in the PNG file
specifying the number of frames) so add the interlace-frames.py tool
to make those.

Change-Id: I866db269107a21351c3df3b4683f233f72234334
 2014-03-11 14:29:50 -07:00