Commit graph

5587 commits

Author SHA1 Message Date
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
Doug Zongker
da993fcf26 am 8d58c957: Merge "Free allocated struct after freeing field"
* commit '8d58c957036835db148acc4e506633a016dc6c7e':
  Free allocated struct after freeing field
2011-01-21 16:12:03 -08:00
Doug Zongker
1966aaf4e6 Merge "remove encrypted filesystem code from recovery" 2011-01-21 13:12:30 -08:00
Doug Zongker
8d58c95703 Merge "Free allocated struct after freeing field" 2011-01-20 07:06:02 -08:00
Ken Sumrall
8f132ed870 Reserve the last 16 Kbytes of /data for the crypto footer.
When formatting /data, if it's an ext4 filesystem, reserve the
last 16 Kbytes for the crypto footer.

Change-Id: I7b401d851ee87732e5da5860df0287a1c331c5b7
2011-01-19 17:12:47 -08:00
Christian Lindeberg
862c83bb31 Free allocated struct after freeing field
Free allocated MtdReadContext after freeing buffer field in struct,
not before.

Change-Id: I237920dc36115389cd2d6948e7a962dbec22fe56
2011-01-19 12:22:41 +01:00
Doug Zongker
540d57f25a remove encrypted filesystem code from recovery
This was never used; encrypted filesystems are being done a different
way now.

Change-Id: I519c57b9be44d001f0b81516af7bfc252069892b
2011-01-18 13:36:58 -08:00
Doug Zongker
be3e6f13b8 option to allow recovery to use 24-bit graphics in UI
Add "RECOVERY_24_BIT := true" to the device's BoardConfig.mk to use
24-bit framebuffers in the recovery ui.

Change-Id: Iaede138bf7870becf237f12f1c0e49c9ff82d007
2011-01-13 16:43:44 -08:00
Colin Cross
49396b79b5 Update make_ext4fs arguments in roots.c
Change-Id: I835e55fb80add6a74cd4d99f77b2528829d9a349
2011-01-05 17:19:37 -08:00
Colin Cross
264f549b7d Update arguments to make_ext4fs
Change-Id: Id96e98da76b3091987b01651f980797b1d6b49d8
2010-12-29 14:18:26 -08:00
Doug Zongker
70f7e8dbf0 am c5ebf1fb: am 5d6309e7: fix comparison of ECC stats before and after mtd reads
* commit 'c5ebf1fba2f870a4e9453721112900975c18e083':
  fix comparison of ECC stats before and after mtd reads
2010-11-04 07:20:28 -07:00
Doug Zongker
c5ebf1fba2 am 5d6309e7: fix comparison of ECC stats before and after mtd reads
* commit '5d6309e77f6055a9aec062dd991d071054726ebb':
  fix comparison of ECC stats before and after mtd reads
2010-11-03 15:18:12 -07:00
Doug Zongker
5d6309e77f fix comparison of ECC stats before and after mtd reads
ECC errors are found by comparing the result of ioctl(ECCGETSTATS)
before and after the read.  But if an error was found causing us to go
to the next block, we'd compare the stats before the *first* read to
the stats after the second (third, fourth, etc.) reads, so we'd read
to the end of the partition without ever succeeding.  Fix logic so we
compare the values before and after each read independently.

Bug: 3162777
Change-Id: I5a13abd7243d2afd1d21bd98cbb233e5124b2e80
2010-11-03 14:31:01 -07:00
Doug Zongker
02971af254 am 8521ef59: am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init
* commit '8521ef5965675da85c7bbbe9c8b86fe68716e855':
  clear recovery framebuffers on allocation; display icon right after ui_init
2010-11-01 10:40:33 -07:00
Doug Zongker
8521ef5965 am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init
* commit '51266d1397309978eac9b2e96035582454f0321b':
  clear recovery framebuffers on allocation; display icon right after ui_init
2010-11-01 10:38:12 -07:00
Doug Zongker
51266d1397 clear recovery framebuffers on allocation; display icon right after ui_init
Make ui_init() clear the framebuffer memory it maps in so the user
isn't treated to a visible flash of random bits on recovery startup.
Call ui_set_background() (to show the installing icon) right after
ui_init() to display something while device_recovery_start() is
working (which can take a second or two on some devices).

Bug: 3145331
Change-Id: I11e7859fab5847370ea4f4932c3fb1558af26c5d
2010-11-01 10:19:12 -07:00
Doug Zongker
7c3ee270ce am 2d87023e: am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_log
Merge commit '2d87023e77b20aa2196c8ceae833b33040b0dc57'

* commit '2d87023e77b20aa2196c8ceae833b33040b0dc57':
  save the log from recovery's last run in /cache/recovery/last_log
2010-09-30 11:25:31 -07:00
Doug Zongker
2d87023e77 am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_log
Merge commit '2c3539e4d8251ad91e0b881253d39583680093e8' into gingerbread-plus-aosp

* commit '2c3539e4d8251ad91e0b881253d39583680093e8':
  save the log from recovery's last run in /cache/recovery/last_log
2010-09-29 13:46:06 -07:00
Doug Zongker
2c3539e4d8 save the log from recovery's last run in /cache/recovery/last_log
Also, don't lose the start of the log whenever a wipe cache is
performed.

Change-Id: I29999762854eb36d1ff2bc20b4183c9077b19777
2010-09-29 13:40:44 -07:00
Doug Zongker
1a32732db2 am 704fa750: am 9b125b04: handle old-style CACHE: packages
Merge commit '704fa75024467fb4e362537f7c341eb056e283b5'

* commit '704fa75024467fb4e362537f7c341eb056e283b5':
  handle old-style CACHE: packages
2010-09-22 13:53:57 -07:00
Doug Zongker
704fa75024 am 9b125b04: handle old-style CACHE: packages
Merge commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5' into gingerbread-plus-aosp

* commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5':
  handle old-style CACHE: packages
2010-09-22 12:06:24 -07:00
Doug Zongker
9b125b04c6 handle old-style CACHE: packages
Change-Id: I7bf52b56770c207ba1c8329243991b07ebb65779
2010-09-22 12:01:37 -07:00
Doug Zongker
6b26c882a8 am af78591c: am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread
Merge commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae'

* commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae':
  mount sdcard only on demand; fix sideload installs
2010-09-21 20:21:52 -07:00
Doug Zongker
af78591c9a am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread
Merge commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28' into gingerbread-plus-aosp

* commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28':
  mount sdcard only on demand; fix sideload installs
2010-09-21 20:01:51 -07:00
Doug Zongker
2c3c5c15d1 Merge "mount sdcard only on demand; fix sideload installs" into gingerbread 2010-09-21 20:00:18 -07:00
Doug Zongker
c18eeb874b mount sdcard only on demand; fix sideload installs
Bug: 3009493
Change-Id: I1a7f99fc41a6a7012742e82f8c06a0c75584890a
2010-09-21 16:58:10 -07:00
Doug Zongker
3d798835a3 am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)
Merge commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7'

* commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7':
  use fs_type "emmc" instead of "block" for consistency (do not merge)
2010-09-21 14:46:43 -07:00
Doug Zongker
8147ba850b am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)
Merge commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98' into gingerbread-plus-aosp

* commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98':
  use fs_type "emmc" instead of "block" for consistency (do not merge)
2010-09-21 14:37:10 -07:00
Doug Zongker
93ca4fc694 use fs_type "emmc" instead of "block" for consistency (do not merge)
Change-Id: Iab60665d9c6daef7893896a64b7f319120a5f8ee
2010-09-21 14:28:11 -07:00
Doug Zongker
cc8cd3f3ca remove the notion of "root path"; support mixed flash types
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path").  Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).

(Cherrypicked from gingerbread w/slight edits.)

Change-Id: I2479ce76b13e73f1d12035c89386c3a82b3edf51
2010-09-21 14:13:45 -07:00
Doug Zongker
0f1ad110f8 am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)
Merge commit '3dba40da1e533c6f419857e4274d9d9dd55868b6'

* commit '3dba40da1e533c6f419857e4274d9d9dd55868b6':
  remove the notion of "root path"; support mixed flash types (do not merge)
2010-09-21 11:38:21 -07:00
Doug Zongker
3dba40da1e am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)
Merge commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47' into gingerbread-plus-aosp

* commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47':
  remove the notion of "root path"; support mixed flash types (do not merge)
2010-09-21 11:34:39 -07:00
Doug Zongker
d4208f9f9d remove the notion of "root path"; support mixed flash types (do not merge)
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path").  Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).

Change-Id: I18b0a572a71c5e087e0b7ae11b1774388339bfd1
2010-09-20 18:07:31 -07:00
Doug Zongker
c9ebb58623 resolved conflicts for merge of 40f0d3b4 to master
Change-Id: If14ab094a8bb11106b0ea7fdf8736e5e4c223089
2010-09-17 16:07:14 -07:00
Doug Zongker
40f0d3b4e0 am d7d42089: remove unneeded partition roots
Merge commit 'd7d4208976125d114d0b8e44438e2417d5275098' into gingerbread-plus-aosp

* commit 'd7d4208976125d114d0b8e44438e2417d5275098':
  remove unneeded partition roots
2010-09-17 13:30:15 -07:00
Doug Zongker
d7d4208976 remove unneeded partition roots
Recovery itself no longer needs to access all these partitions;
manipulation of them is done by the updater binary.  This is a small
first step towards removing roots entirely.

Change-Id: I3fbcada32079a37db4cc097861dfa91e0a08da30
2010-09-17 13:02:48 -07:00
Brian Swetland
97e54ef573 am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils api
Merge commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8'

* commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8':
  do not merge - update to match ext4utils api
2010-09-15 19:49:56 -07:00
Brian Swetland
1dcd2fd0c7 am 792b0071: do not merge - update to match ext4utils api
Merge commit '792b00712bb1411d3b0583bcea95b43b3107fb95' into gingerbread-plus-aosp

* commit '792b00712bb1411d3b0583bcea95b43b3107fb95':
  do not merge - update to match ext4utils api
2010-09-15 18:07:22 -07:00
Doug Zongker
dc49ce453e add missing sparseness parameter
Change-Id: Ie6e309b127e80cd6475f1deaa5dbadf9f5cc2746
2010-09-15 18:05:10 -07:00
Brian Swetland
792b00712b do not merge - update to match ext4utils api
Change-Id: I9d34e491022d7dfed653a861b0728a0a656f1fbe
2010-09-15 18:03:58 -07:00
Doug Zongker
6c3e03b3c5 resolved conflicts for merge of 85bcf776 to master
Change-Id: Iab4f25702a5a62b9172f81fd543a8240a0e603c3
2010-09-15 17:51:50 -07:00
Doug Zongker
a66c32ab1d resolved conflicts for merge of 9f89b0e4 to master
Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
2010-09-15 17:40:14 -07:00
Doug Zongker
d7693c4c8e resolved conflicts for merge of 76445f3a to master
Change-Id: I658894dcaddbf0de428e3c51dbcdc306d3f47a52
2010-09-15 17:03:51 -07:00
Doug Zongker
6b1ff61f62 am 858f0a76: am 8e5e4dad: close update package before installing; allow remount
Merge commit '858f0a763d0f736eb721f54257b6164886bfcbfc'

* commit '858f0a763d0f736eb721f54257b6164886bfcbfc':
  close update package before installing; allow remount
2010-09-15 16:32:52 -07:00
Doug Zongker
4f69afdb63 am bd4bc088: am d12560aa: add the ability to seek to a raw location while reading MTD partition
Merge commit 'bd4bc088e286b87a5d1469598644125ecc0fd547'

* commit 'bd4bc088e286b87a5d1469598644125ecc0fd547':
  add the ability to seek to a raw location while reading MTD partition
2010-09-15 12:32:22 -07:00
Doug Zongker
85bcf776e1 am 8a8e6cc3: (cherry-pick) EMMC support in applypatch
Merge commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509' into gingerbread-plus-aosp

* commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509':
  (cherry-pick) EMMC support in applypatch
2010-09-15 11:17:34 -07:00
Doug Zongker
9f89b0e467 am 56c5105b: support for ext4/EMMC filesystems in updater binary
Merge commit '56c5105bd7096704eaed35329b2c8c84cc282867' into gingerbread-plus-aosp

* commit '56c5105bd7096704eaed35329b2c8c84cc282867':
  support for ext4/EMMC filesystems in updater binary
2010-09-15 11:14:51 -07:00