Commit Graph

333 Commits

Author SHA1 Message Date
Michael Ward
933487868f Add missing commands to recovery init.rc
Wrote some missing items in recovery, most notably the serial number so that it shows up correctly on adb.

Change-Id: If430c0b78191c8d77f781aa605b5081571451775
2011-07-07 13:29:43 -07:00
Mike Lockwood
718a2f7872 init.rc: Simplify logic for starting adbd in recovery
Always start adbd if ro.debuggable=1 rather than basing it on user preference
in persistent system properties.

Use new D001 product ID, which I just allocated for "android recovery mode"

Change-Id: I6f1eac5257eaad2e538c0a8dd549ad89219efa3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-29 10:22:04 -04:00
Michael Ward
9d2629c1c4 Allow applying an OTA package manually from cache.
Change-Id: I8f78377555c658a992ca95cadf11b67ddc93fed8
2011-06-24 11:53:58 -07:00
Michael Ward
3dbe66b71d Get the correct line_length.
Set the BPP and other fields and write it back, so the line_length comes back correctly.

Change-Id: I85e4e8223c79b9394ae1fb609b3026de62027ab8
2011-06-24 11:06:01 -07:00
Doug Zongker
fb04b87002 fix adb root in recovery
recovery's init.rc was missing lines that made adb root work.

Change-Id: I300e6997e3b5cb9c7b542b2012eed61deb2550f1
2011-06-23 15:30:34 -07:00
Michael Ward
9d1bcdf7b8 Graphics can handle stride != xres, and BGRA support.
Change-Id: Ifee94ac08028e62a40241a089ac7c36346fea3a3
2011-06-22 15:04:00 -07:00
Mike Lockwood
7e58b65efb Fix starting adb in recovery mode
Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-19 02:52:01 -04:00
Jean-Baptiste Queru
5a4e03d120 am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread
* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':
2011-06-08 14:47:00 -07:00
Jean-Baptiste Queru
7f72ad7934 am a94d9548: am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
* commit 'a94d954862fab26f6159ed7bb836ba6758a569fd':
  Mute unharmful build warning at the top of the build log:
2011-06-08 14:46:59 -07:00
Jean-Baptiste Queru
f84b25243d am 6ebedf00: am 82da01d6: Merge from gingerbread
* commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':
2011-06-07 13:23:26 -07:00
Jean-Baptiste Queru
a94d954862 am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
* commit '1117c69fe40dccfa6090d184094c4a6d407ab8d6':
  Mute unharmful build warning at the top of the build log:
2011-06-07 13:22:51 -07:00
Jean-Baptiste Queru
6ebedf0053 am 82da01d6: Merge from gingerbread
* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':
2011-06-01 14:23:11 -07:00
Jean-Baptiste Queru
82da01d6a3 Merge from gingerbread
Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8
2011-06-01 14:08:15 -07:00
Jean-Baptiste Queru
1117c69fe4 am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
* commit '7172eb7b623f4b30f5a709d639fcd3fb51cd6220':
  Mute unharmful build warning at the top of the build log:
2011-06-01 08:06:14 -07:00
Jean-Baptiste Queru
7172eb7b62 Merge "Mute unharmful build warning at the top of the build log:" into gingerbread 2011-05-31 14:03:36 -07:00
Ying Wang
b7b7b37457 Mute unharmful build warning at the top of the build log:
diff: out/target/product/generic/obj/PACKAGING/updater_extensions_intermediates/register.inc.list:
No such file or directory

Change-Id: I269b1703b6091b343db45b1c5cdd0962c738788b
2011-05-24 16:11:05 -07:00
The Android Open Source Project
28a08efe15 Reconcile with honeycomb-release
Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60
2011-05-20 12:45:51 -07:00
The Android Automerger
e44b41a770 am c2a158db: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit 'c2a158db9588e6ad290dd0f9171a190609900387':
  delay accessing misc partition until its device exists
2011-05-09 10:53:22 -07:00
The Android Automerger
c2a158db95 Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE 2011-05-08 22:31:27 -07:00
Doug Zongker
c636b7300b am 90588820: delay accessing misc partition until its device exists
* commit '90588820b7110acf142d17457f0d10cd7cb57a8a':
  delay accessing misc partition until its device exists
2011-05-04 12:46:12 -07:00
Doug Zongker
90588820b7 delay accessing misc partition until its device exists
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device.  Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.

Change-Id: I93256db4b047c76020490e8a3dc76b8ade643291
2011-05-04 11:17:35 -04:00
Doug Zongker
f4bb554ee9 delay accessing misc partition until its device exists
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device.  Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.

Change-Id: I988442d5701394d7152bfab3c571e7548c364f61
2011-05-04 11:07:48 -04:00
Doug Zongker
cfd256a332 delay accessing misc partition until its device exists
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device.  Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.

Change-Id: Ib9bf6c35fa2c28fc43aa7550aaaffb76c9f6e120
2011-04-22 09:33:14 -07:00
Doug Zongker
179b2d9895 make write_raw_image able to take a blob
write_raw_image() can now take either a blob or a filename as the
source.  The blob format eliminates the need for a temp file.

Change-Id: I0c6effec53d47862040efcec75e64b7c951cdcf7
2011-04-12 16:48:49 -07:00
Doug Zongker
469243e536 save a last_install file with the result of the last package install attempt
When installing a package, create /cache/recovery/last_install, which
contains the filename of the package and a 1 or 0 for success or
failure.

Also, don't mount ext4 and vfat filesystems as read-only (on devices
where /cache is ext4, we need it to be read-write).

Change-Id: I0cf2a1921bbd65e06343aa74e2006577fac77c2c
2011-04-12 09:28:10 -07:00
Doug Zongker
3ed8e18721 am 4762633c: log which key a package verified against in recovery
* commit '4762633cf846d17516878303502b056b52353a5d':
  log which key a package verified against in recovery
2011-03-15 13:47:23 -07:00
Doug Zongker
4762633cf8 log which key a package verified against in recovery
Change-Id: I0d91b715d1eb9e45e2fce54bb93ba0abef92727e
2011-03-15 12:11:08 -07:00
Iliyan Malchev
201aa88cba recovery: mount /sdcard read-only
Change-Id: Ieffafe00cf82620057cacd0629cb60b0e6aad817
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-11 16:47:53 -08:00
Ken Sumrall
90415aca67 am 6e4472ab: Have recovery reboot using the new android_reboot() function.
* commit '6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40':
  Have recovery reboot using the new android_reboot() function.
2011-03-10 19:44:38 -08:00
Ken Sumrall
6e4472abbd Have recovery reboot using the new android_reboot() function.
The new android_reboot() function is a nicer way to reboot the
system.  I can optionally sync() and remount read-only writable
filesystems.  This fixes bug 3350709.

Change-Id: Ic4c8676debd642e57bce3107b99dd810d90b6f82
2011-03-10 19:30:13 -08:00
Doug Zongker
f66088d2ce am 6ce4a326: don\'t reboot for inactivity if USB is connected
* commit '6ce4a326efae4abb108e19899f4d7776abc362da':
  don't reboot for inactivity if USB is connected
2011-03-08 23:53:35 -08:00
Doug Zongker
6ce4a326ef don't reboot for inactivity if USB is connected
(Cherry-pick back from master.)

Bug: 4071007
Change-Id: I28355c593770df678968185171bdd19dabe7f062
2011-03-08 17:51:14 -08:00
Doug Zongker
4cc533dd1c don't reboot for inactivity if USB is connected
Change-Id: Icba35da91167d30c446581afb47d0804e49964bf
2011-03-08 12:25:05 -08:00
Doug Zongker
b70fe3f76a am 68189f29: allow paletted RGB images in recovery
* commit '68189f2994690538b6e3bddc3788cb092cbda088':
  allow paletted RGB images in recovery
2011-03-07 15:47:04 -08:00
Doug Zongker
68189f2994 allow paletted RGB images in recovery
Recovery assumes any paletted images are in RGBA format.  Make it
handle both RGB and RGBA paletted images.

Bug: 3514884
Change-Id: I517cd571aa3f434dacacc33a774236260aec20ef
2011-03-04 17:13:16 -08:00
Eric Fischer
7e69e2cccc Merge branch 'master' of ssh://android-git:29418/platform/bootable/recovery 2011-03-04 00:29:22 -08:00
Doug Zongker
73bb6f749f convert recovery images to palettized PNGs
Cuts the byte size of the recovery images in half, roughly.

Change-Id: I3c45b5e58423b57faca83fc67b4e24e8d643c5b1
2011-03-03 16:52:06 -08:00
Doug Zongker
b7c91766da convert recovery images to palettized PNGs
Cuts the byte size of the recovery images in half, roughly.

Change-Id: I453a499e9937163c545dab3c552201882766e218
2011-03-03 14:43:13 -08:00
Doug Zongker
be6d4d1052 change the default recovery assets to be in holograph style
Also remove the weird backwards compatibility thing for animations
with fewer than 10 frames.  Frames are always named "name01.png",
"name02.png", ..., no matter how many there are.

Change-Id: I7af64fdec1bfcdb0464998b735ec8d6c626ffe9d
2011-03-02 10:38:02 -08:00
Doug Zongker
6809c51f8d make recovery UI images more general; allow for installation animation
Change some of the UI parameters (# of indeterminate progress bar
frames, fps, etc.) from #defined constants to variables that can be
set by the device-specific recovery_ui code (via a new function).

Support overlaying different images on top of the base installation
icon to animate it.  Make the FPS control more accurate.

Change-Id: I9268b389b7ea6b3ed9e0c7eae37baf4272e60edd
2011-03-01 14:04:34 -08:00
Doug Zongker
c007b961d7 am 8d43d940: am 2c273f00: store partition length in recovery.fstab
* commit '8d43d94065e88e00e1460841b43c7de584ee5585':
  store partition length in recovery.fstab
2011-02-24 20:35:19 -08:00
Doug Zongker
ee458bbf9b store partition length in recovery.fstab
Don't hardcode magical partition behavior in roots.c.

Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
2011-02-24 18:46:44 -08:00
Doug Zongker
8d43d94065 am 2c273f00: store partition length in recovery.fstab
* commit '2c273f004e0504ae0389ad160ed2a92624873189':
  store partition length in recovery.fstab
2011-02-24 18:38:48 -08:00
Doug Zongker
2c273f004e store partition length in recovery.fstab
Don't hardcode magical partition behavior in roots.c.

Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
2011-02-24 18:34:36 -08:00
Doug Zongker
2810ceda34 store partition length in recovery.fstab
Don't hardcode magical partition behavior in roots.c.

Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
2011-02-17 15:55:21 -08:00
Ying Wang
4c05d95112 Fix x86 build.
Change-Id: Iada6268b0a72ee832113ea397334cc7950a37051
2011-02-08 19:51:07 -08:00
Doug Zongker
6da1abbc38 am 5df22d03: am 5cae445e: make recovery reboot after 2 minutes of no activity
* commit '5df22d03d2e7c6de213d83a58e0af39c42f839ca':
  make recovery reboot after 2 minutes of no activity
2011-01-25 13:56:07 -08:00
Doug Zongker
5df22d03d2 am 5cae445e: make recovery reboot after 2 minutes of no activity
* commit '5cae445e43c5928daba0a76745b0dd2657274eda':
  make recovery reboot after 2 minutes of no activity
2011-01-25 13:53:52 -08:00
Doug Zongker
5cae445e43 make recovery reboot after 2 minutes of no activity
If recovery sits for 2 minutes in prompt_and_wait(), and you've never
turned the screen on via the magic keypress, go ahead and reboot.  (We
used to assume that the user could pull the battery to get out of this
state, but on devices with nonremovable batteries...)

If you've ever enabled display of the log/menu since recovery started,
we assume you know what you're doing and will stay in recovery until
you choose to reboot.

Bug: 3387873
Bug: 3387274
Change-Id: I041621e5db132df9a925e6808845a7c45e1b427a
2011-01-25 13:50:16 -08:00
Doug Zongker
80abd51dbc am da993fcf: am 8d58c957: Merge "Free allocated struct after freeing field"
* commit 'da993fcf2665102435b05d6b20a4c4e8f8bd3b8f':
  Free allocated struct after freeing field
2011-01-21 16:15:02 -08:00