PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,186 Commits 1 Branch 0 Tags
dfe34afed681692aa9a8703d5c2a8add0f345c8d
Commit Graph
1186 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao BaoandAndroid Git Automerger 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
Tao BaoandGerrit Code Review 43b8081028 Merge "Factor out option variables from int to bool types" 2015-03-25 23:40:58 +00:00
Tao Bao 145d861460 Factor out option variables from int to bool types 
Change-Id: Ia897aa43e44d115bde6de91789b35723826ace22
 2015-03-25 15:56:15 -07:00
Elliott HughesandAndroid Git Automerger aff79c89e3 am e31f9565: Merge "Remove support for Cupcake kernels." 
* commit 'e31f956597f758154a5f6ca7a5793230c8eff936':
  Remove support for Cupcake kernels.
 2015-03-24 23:40:26 +00:00
Elliott HughesandGerrit Code Review e31f956597 Merge "Remove support for Cupcake kernels." 2015-03-24 23:31:07 +00:00
Elliott HughesandAndroid Git Automerger b3247c2922 am 9460bb2c: Merge "Fix recovery image text rendering." 
* commit '9460bb2c3df9e985c14d2dd76b03aefb3333b251':
  Fix recovery image text rendering.
 2015-03-24 22:58:46 +00:00
Elliott Hughes 59156bdeda Remove support for Cupcake kernels. 
Change-Id: I7376b9d3c1e11d19e164072d6e9d09c1183114a0
 2015-03-24 15:58:15 -07:00
Elliott HughesandGerrit Code Review 9460bb2c3d Merge "Fix recovery image text rendering." 2015-03-24 22:54:37 +00:00
Elliott Hughes 01a4d08010 Fix recovery image text rendering. 
Previously most devices would lose the character before a line wrap.
The log's text rendering was starting at offset 4 but none of the
arithmetic was taking this into account. It just happened to work
on the Nexus 9's 1536-pixel wide display (1536/18=85.3) but not on
a device such as the Nexus 5 (1080/18=60).

The only active part of this change is the change from 4 to 0 in the
gr_text call. The rest is just a few bits of trivial cleanup while I
was working out what was going on.

Change-Id: I9279ae323c77bc8b6ea87dc0fe009aaaec6bfa0e
 2015-03-24 15:21:48 -07:00
Elliott HughesandAndroid Git Automerger fe5294ad74 am 47733eaf: Merge "Fix wipe command when using sideload in recovery" 
* commit '47733eafdc37203d59a8a0a17ccfb936d2920e31':
  Fix wipe command when using sideload in recovery
 2015-03-24 22:02:31 +00:00
Elliott HughesandGerrit Code Review 47733eafdc Merge "Fix wipe command when using sideload in recovery" 2015-03-24 21:43:42 +00:00
Christian PoetzschandElliott Hughes 4ec58a4ee5 Fix wipe command when using sideload in recovery 
Add support for the wipe command when using sideload within the
recovery. All the support for this command is in place, only the
execution of the actual wipe command itself was missing.

Change-Id: Ia9cdfc912bfb9f558fa89b9f0ed54e843ede41f2
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
 2015-03-24 11:26:42 -07:00
Elliott HughesandAndroid Git Automerger cd3d359205 am 733deb26: Merge "Make the recovery menus wrap." 
* commit '733deb267db3488be408cbe020769108ee6584b0':
  Make the recovery menus wrap.
 2015-03-23 23:32:41 +00:00
Elliott HughesandGerrit Code Review 733deb267d Merge "Make the recovery menus wrap." 2015-03-23 23:26:15 +00:00
Elliott HughesandAndroid Git Automerger 30ad046192 am 31e47876: Merge "Always use strerror to report errno in recovery." 
* commit '31e4787634a59d32ff80ccd684bc439cecc4d8c8':
  Always use strerror to report errno in recovery.
 2015-03-23 22:00:50 +00:00
Elliott HughesandGerrit Code Review 31e4787634 Merge "Always use strerror to report errno in recovery." 2015-03-23 21:53:13 +00:00
Elliott Hughes fc06f87ecc Make the recovery menus wrap. 
The real problem is that the recovery UI is sluggish. But being able
to wrap off the top to the bottom halves the maximum distance you'll
have to go.

Change-Id: Ifebe5b818f9c9a1c4187d4ac609422da1f38537f
 2015-03-23 13:45:31 -07:00
Elliott Hughes 1fdd452f47 Always use strerror to report errno in recovery. 
Change-Id: I7009959043150fabf5853a43ee2448c7fbea176e
 2015-03-23 13:33:57 -07:00
Elliott HughesandAndroid Git Automerger 3dce9e761f am e944944f: Merge "Add "Apply update from sdcard" to default recovery image." 
* commit 'e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2':
  Add "Apply update from sdcard" to default recovery image.
 2015-03-23 15:07:59 +00:00
Elliott HughesandGerrit Code Review e944944fa5 Merge "Add "Apply update from sdcard" to default recovery image." 2015-03-23 15:03:24 +00:00
Elliott Hughes c51ac89f0e Add "Apply update from sdcard" to default recovery image. 
At the moment, this is the only difference in the sprout recovery
image. That's silly. Let's just improve the error handling slightly
and always have this option present.

Also make the obscure "<3e>" less unclear.

Also use "power button" as the default text rather than "enter button",
because it's been years since anyone had one of those. (Longer term we
should let subclassers tell us the keycode and we translate it to the
correct string.)

Also move the two "Reboot" options together, put "Power off" at the
bottom (and use that terminology, like the real UI, rather than
"Power down"), and use capitals throughout.

Finally, add a README.md with some useful instructions.

Change-Id: I94fb19f73d79c54fed2dda30cefb884426641b5c
 2015-03-22 18:16:31 -07:00
Dan AlbertandAndroid Git Automerger b8838e6bf2 am 8c637903: Merge "Remove unused libutils references." 
* commit '8c637903fedafd0acdc3906f42032f2e88cd1f7f':
  Remove unused libutils references.
 2015-03-14 05:59:11 +00:00
Dan AlbertandGerrit Code Review 8c637903fe Merge "Remove unused libutils references." 2015-03-14 05:55:27 +00:00
Dan Albert b2f945932c Remove unused libutils references. 
Change-Id: I22797643103ce1d4371198433ad9849cc83d3d7c
 2015-03-13 22:33:38 -07:00
Dan Albert 39ac6de4c5 git commit -m "resolved conflicts for merge of d29f641b to stage-aosp-master" 2015-03-12 15:48:44 -07:00
Tao BaoandAndroid Git Automerger 233b32f6e9 am d5369e5d: (-s ours) am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch 
* commit 'd5369e5d91c9c7c55cbd8f1c306098182c209baf':
  updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
 2015-03-12 21:51:44 +00:00
Ying WangandAndroid Git Automerger af48901be1 am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the recovery image." 
* commit 'cc368fdea6e5415be541dadfe04107b76a82c537':
  Install the recovery binary directly to the recovery image.
 2015-03-12 21:33:39 +00:00
Tao BaoandAndroid Git Automerger d5369e5d91 am 18f371d8: updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch 
* commit '18f371d814b26132aadf11de6cc305f02484535a':
  updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
 2015-03-11 18:03:57 +00:00
Ying WangandAndroid Git Automerger cc368fdea6 am 8290aa50: Merge "Install the recovery binary directly to the recovery image." 
* commit '8290aa501f1b0354262c304962bc4da2e30457a8':
  Install the recovery binary directly to the recovery image.
 2015-03-11 17:57:01 +00:00
Ying WangandGerrit Code Review 8290aa501f Merge "Install the recovery binary directly to the recovery image." 2015-03-11 17:41:40 +00:00
Ying Wang 2196a3eda0 Install the recovery binary directly to the recovery image. 
This eliminated the previous hack, that doesn't work reliably with the
"LOCAL_REQUIRED_MODULES := mkfs.f2fs".

Bug: 19666886
Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
 2015-03-11 10:39:43 -07:00
Tao Bao 18f371d814 updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch 
Return NULL to abort the update process. Note that returning ""
won't stop the script.

Change-Id: Ifd108c1356f7c92a905c8776247a8842c6445319
 2015-03-11 09:53:56 -07:00
Ying Wang 5a50b1bce5 Install the recovery binary directly to the recovery image. 
This eliminated the previous hack, that doesn't work reliably with the
"LOCAL_REQUIRED_MODULES := mkfs.f2fs".

Bug: 19666886
Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
 2015-03-10 11:58:37 -07:00
Narayan KamathandAndroid Git Automerger 00c9857867 am fb7d8965: am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip." 
* commit 'fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7':
  Remove more dead code from minzip.
 2015-02-27 17:16:04 +00:00
Narayan KamathandAndroid Git Automerger fb7d896595 am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip." 
* commit '023e4374469b8cae68783036b6977ea721c1e07a':
  Remove more dead code from minzip.
 2015-02-27 17:10:25 +00:00
Narayan KamathandAndroid Git Automerger 023e437446 am 579b9299: (-s ours) Merge "Remove more dead code from minzip." 
* commit '579b92991ccd626527c75042aca032d3ac4207a2':
  Remove more dead code from minzip.
 2015-02-27 17:04:43 +00:00
Dan AlbertandAndroid Git Automerger d1b078df33 am 66f94728: am 3deba524: am ecead276: Merge "Add tests for read_block_adb." 
* commit '66f94728ef2f4ac09c42c4623ec45d5eac6e9d53':
  Add tests for read_block_adb.
 2015-02-27 16:53:58 +00:00
Dan AlbertandAndroid Git Automerger 66f94728ef am 3deba524: am ecead276: Merge "Add tests for read_block_adb." 
* commit '3deba524f9d1e94b613d9c13f4c76595f0ec99ab':
  Add tests for read_block_adb.
 2015-02-27 16:45:43 +00:00
Dan AlbertandAndroid Git Automerger 3deba524f9 am ecead276: Merge "Add tests for read_block_adb." 
* commit 'ecead276f068cb53bddb2458b200aa96473ddfb3':
  Add tests for read_block_adb.
 2015-02-27 16:37:40 +00:00
Narayan KamathandGerrit Code Review 579b92991c Merge "Remove more dead code from minzip." 2015-02-27 14:20:19 +00:00
Narayan Kamath e57c62a007 Remove more dead code from minzip. 
I've added explanatory comments to mzExtractRecursive because
that function will live on as a utility even after we move the
zip format related logic to libziparchive.

bug: 19472796

Change-Id: Id69db859b9b90c13429134d40ba72c1d7c17aa8e
 2015-02-27 14:19:59 +00:00
Narayan Kamath 9c0f5d6b34 Remove more dead code from minzip. 
I've added explanatory comments to mzExtractRecursive because
that function will live on as a utility even after we move the
zip format related logic to libziparchive.

bug: 19472796

(cherry-picked from commit c9ccdfd7a42de08c47ab771b94dc5b9d1f957b95)

Change-Id: I8b7fb6fa3eafb2e7ac080ef7a7eceb691b252d8a
 2015-02-27 12:58:16 +00:00
Dan AlbertandGerrit Code Review ecead276f0 Merge "Add tests for read_block_adb." 2015-02-27 01:08:28 +00:00
Dan Albert ffd6c31a77 Add tests for read_block_adb. 
These tests aren't completely representative in that they don't run in
the recovery image. We might want to look in to adding a self-test
option to the recovery UI. Until then, these can be run on a normal
device (which is easier to do anyway).

Bug: 19522788
Change-Id: Idb20feb55d10c62905c2480ab1b61a2e4b5f60d8
 2015-02-26 17:00:11 -08:00
Jesse ZhaoandAndroid Git Automerger 670a0c6fe9 am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value. 
* commit '0257d107f2039e24e4fbdd98d7536f402628bd78':
  Bump up max_map_count value.
 2015-02-27 00:03:58 +00:00
Jesse ZhaoandAndroid Git Automerger 0257d107f2 am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value. 
* commit '71c454293118c51487a62c5d7c4da6262eae691c':
  Bump up max_map_count value.
 2015-02-26 23:57:04 +00:00
Jesse ZhaoandAndroid Git Automerger 71c4542931 am f66bf339: am 3e91f691: Bump up max_map_count value. 
* commit 'f66bf33956eebba26bedc7f098dedc8a2c1cf942':
  Bump up max_map_count value.
 2015-02-26 23:34:49 +00:00
Dan AlbertandAndroid Git Automerger cd70624436 am 9b14c4b0: am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write." 
* commit '9b14c4b0e8b8b102c699b554d701e461e7e562e7':
  This read accidentally got turned in to a write.
 2015-02-26 23:32:45 +00:00
Dan AlbertandAndroid Git Automerger 9b14c4b0e8 am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a write." 
* commit '735a0f0fc3de936db3ce5a99dbcf02e970d47ba0':
  This read accidentally got turned in to a write.
 2015-02-26 23:23:26 +00:00
Jesse ZhaoandAndroid Git Automerger f66bf33956 am 3e91f691: Bump up max_map_count value. 
* commit '3e91f691a6bf6b154ea98982b073e84e86328baf':
  Bump up max_map_count value.
 2015-02-26 23:20:35 +00:00