PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,056 Commits 1 Branch 0 Tags
91f40d9bf56e4bb85fb46d0774296214353dae87
Commit Graph
1056 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott HughesandAndroid Git Automerger 91f40d9bf5 am 98e2c509: am 78aa50d3: Merge "recovery: Handle EV_SW events" 
* commit '98e2c509a636db7c4d9a89c086e8d4ac03a6970b':
  recovery: Handle EV_SW events
 2015-02-11 02:55:28 +00:00
Elliott HughesandAndroid Git Automerger 547236785c am ee7127cc: am bf0be350: Merge "recovery: Generate libminui dynamic library" 
* commit 'ee7127cca575967a90f3ede92cd05552000ccb14':
  recovery: Generate libminui dynamic library
 2015-02-11 02:55:27 +00:00
Elliott HughesandAndroid Git Automerger e999d0071d am dcbf4fc5: resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp 
* commit 'dcbf4fc571236bf5aa5286294b3c727be725db70':
  recovery: Properly detect userdebug or eng builds
 2015-02-11 02:55:26 +00:00
Elliott HughesandAndroid Git Automerger 98e2c509a6 am 78aa50d3: Merge "recovery: Handle EV_SW events" 
* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
  recovery: Handle EV_SW events
 2015-02-11 00:33:17 +00:00
Elliott HughesandAndroid Git Automerger ee7127cca5 am bf0be350: Merge "recovery: Generate libminui dynamic library" 
* commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0':
  recovery: Generate libminui dynamic library
 2015-02-11 00:33:16 +00:00
Elliott HughesandGerrit Code Review 78aa50d349 Merge "recovery: Handle EV_SW events" 2015-02-11 00:28:56 +00:00
Ajay DudaniandElliott Hughes 07d9627d7c recovery: Handle EV_SW events 
Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
 2015-02-10 16:28:07 -08:00
Elliott HughesandGerrit Code Review bf0be350dd Merge "recovery: Generate libminui dynamic library" 2015-02-11 00:26:18 +00:00
Ajay DudaniandElliott Hughes 9905f3a4ee recovery: Generate libminui dynamic library 
Allow factory test images to use minui functionaltiy
by making use of libminui dynamic library.

Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
 2015-02-10 16:25:17 -08:00
Elliott Hughes dcbf4fc571 resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp 
Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
 2015-02-10 16:20:53 -08:00
Elliott HughesandGerrit Code Review 35efcd275f Merge "recovery: Properly detect userdebug or eng builds" 2015-02-10 23:55:45 +00:00
Elliott Hughes f14af80a14 recovery: Properly detect userdebug or eng builds 
The recovery system behaves a little bit differently on userdebug or
eng builds by presenting error reports to the user in the ui.
This is controlled by checking the build fingerprint for the string
:userdebug/ or :eng/. But with AOSP version numbers most AOSP
builds blows the 92 char limit of ro.build.fingerprint and therefore
the property is not set, so this condition will always be evaluated
to false, for most builds.

Instead of depending on the flaky ro.build.fingerprint this change
uses ro.debuggable.

Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
 2015-02-10 14:46:14 -08:00
Nick KralevichandAndroid Git Automerger 54b373c044 am ec5c1c1e: am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 
* commit 'ec5c1c1e291062576925b80b532d36df118103f5':
  Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
 2015-02-09 04:15:24 +00:00
Elliott HughesandAndroid Git Automerger 2fd48fcca5 am 42b09d25: am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'." 
* commit '42b09d255afdb47bc0546183cbc68e86147baaab':
  There's no GPL code in 'updater'.
 2015-02-09 04:15:14 +00:00
Nick KralevichandAndroid Git Automerger ec5c1c1e29 am 99e084ca: Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 
* commit '99e084ca8012bc7af52ae2fb9e72ab7180177daf':
  Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
 2015-02-08 15:20:50 +00:00
Nick KralevichandGerrit Code Review 99e084ca80 Merge "Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read" 2015-02-08 15:09:00 +00:00
Nanik Tolaram 4e8e93b666 Remove dead/unused code and realign some of the comments 
to make it more cleaner and easier to read

Change-Id: If536d482c0ed645368084e76d8ec060f05d89137
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
 2015-02-08 22:31:14 +11:00
Elliott HughesandAndroid Git Automerger 42b09d255a am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'." 
* commit '6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05':
  There's no GPL code in 'updater'.
 2015-02-07 07:43:35 +00:00
Elliott HughesandGerrit Code Review 6a0d2fbcaa Merge "There's no GPL code in 'updater'." 2015-02-07 07:34:41 +00:00
Sami TolvanenandAndroid (Google) Code Review 0b52c91347 Merge "Support resuming block based OTAs" 2015-02-06 10:25:52 +00:00
Elliott Hughes 8a9014d572 There's no GPL code in 'updater'. 
This notice was added for libsyspatch and libxdelta3, but that code
has been removed since.

Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
 2015-02-05 14:53:55 -08:00
Elliott HughesandAndroid Git Automerger 00f76246b2 am 40862ab5: am aeecac54: Merge "Add missing includes." 
* commit '40862ab59e376d50036fa56a9f3f08c42530c96a':
  Add missing includes.
 2015-01-30 21:28:06 +00:00
Elliott HughesandAndroid Git Automerger 40862ab59e am aeecac54: Merge "Add missing includes." 
* commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e':
  Add missing includes.
 2015-01-30 21:16:36 +00:00
Sami Tolvanen 90221205a3 Support resuming block based OTAs 
Add support for transfer list version 3, which allows us to
verify the status of each command and resume an interrupted
block based OTA update. Notes on the changes:

 - Move the previous BlockImageUpdateFn to a shorter and
   reusable PerformBlockImageUpdate, which can be used also
   in BlockImageVerifyFn for verification.

 - Split individual transfer list commands into separate
   functions with unified parameters for clarity, and use
   a hash table to locate them during execution.

 - Move common block reading and writing to ReadBlocks and
   WriteBlocks to reduce code duplication, and rename the
   readblock and writeblock to less confusing read_all and
   write_all.

The coding style of the new functions follows the existing
style in the updater/edify code.

Needs matching changes from
  Ia5c56379f570047f10f0aa7373a1025439495c98

Bug: 18262110
Change-Id: I1e752464134aeb2d396946348e6041acabe13942
 2015-01-30 14:38:31 +00:00
Elliott HughesandGerrit Code Review aeecac5444 Merge "Add missing includes." 2015-01-30 06:24:40 +00:00
Elliott Hughes cd3c55ab40 Add missing includes. 
Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
 2015-01-29 20:50:08 -08:00
Elliott HughesandAndroid Git Automerger d2a4ef50ac am 22b8fe96: am dab56cac: Merge "Add missing includes." 
* commit '22b8fe96663de518bf77049a1e449430b66e7d11':
  Add missing includes.
 2015-01-28 22:08:20 +00:00
Elliott HughesandAndroid Git Automerger 22b8fe9666 am dab56cac: Merge "Add missing includes." 
* commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3':
  Add missing includes.
 2015-01-28 20:48:30 +00:00
Elliott HughesandGerrit Code Review dab56cac95 Merge "Add missing includes." 2015-01-28 20:36:40 +00:00
Elliott Hughes 26dbad2b98 Add missing includes. 
Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
 2015-01-28 12:09:05 -08:00
Dan AlbertandAndroid Git Automerger 435f65eaa1 am 88c30fb6: am eaeb55f7: Merge "Start losing code to libadb." 
* commit '88c30fb652ad40835f1d1045e2c851ff8813e873':
  Start losing code to libadb.
 2015-01-27 18:32:56 +00:00
Dan AlbertandAndroid Git Automerger 88c30fb652 am eaeb55f7: Merge "Start losing code to libadb." 
* commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d':
  Start losing code to libadb.
 2015-01-27 02:08:45 +00:00
Dan AlbertandGerrit Code Review eaeb55f745 Merge "Start losing code to libadb." 2015-01-27 00:51:09 +00:00
Christopher FerrisandAndroid Git Automerger e497826dd8 am 2d67a483: am cdc38d04: Merge "Fix the v2 descriptor handling." 
* commit '2d67a483ede93f1d3906e1d03f46af34887764ac':
  Fix the v2 descriptor handling.
 2015-01-26 22:09:48 +00:00
Christopher FerrisandAndroid Git Automerger 32d30e5924 am efa16af5: am cad5ce81: Merge "adbd: Support for new f_fs descriptor format" 
* commit 'efa16af53ebc3ef4974ff791d0f03ec66b20a5e8':
  adbd: Support for new f_fs descriptor format
 2015-01-26 22:09:37 +00:00
Christopher FerrisandAndroid Git Automerger 2d67a483ed am cdc38d04: Merge "Fix the v2 descriptor handling." 
* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
  Fix the v2 descriptor handling.
 2015-01-26 21:45:16 +00:00
Christopher FerrisandGerrit Code Review cdc38d0401 Merge "Fix the v2 descriptor handling." 2015-01-26 21:28:21 +00:00
Christopher FerrisandAndroid Git Automerger efa16af53e am cad5ce81: Merge "adbd: Support for new f_fs descriptor format" 
* commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4':
  adbd: Support for new f_fs descriptor format
 2015-01-26 21:21:55 +00:00
Christopher FerrisandGerrit Code Review cad5ce81ad Merge "adbd: Support for new f_fs descriptor format" 2015-01-26 21:11:00 +00:00
Christopher Ferris 3ed8ef02ed Fix the v2 descriptor handling. 
There was a misinterpretation of how the v2 header works. The flags
in the header indicate what is in the rest of the structure.

Bug: 19127803
Change-Id: I83fd93df1df196300a80ddeb3b49ca7851ffcfb8
 2015-01-26 12:53:20 -08:00
Badhri Jagan SridharanandChristopher Ferris 9e3cce50a3 adbd: Support for new f_fs descriptor format 
The patch "[RFC] usb: gadget: f_fs: Add flags
to  descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.

This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.

Bug: 17394972

(cherry picked from commit b5b43043fa)

Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
 2015-01-26 12:49:13 -08:00
Elliott HughesandAndroid Git Automerger 528b3ee699 am 4db9c893: am d4069928: Merge "Add missing <string.h> include." 
* commit '4db9c8935df6347e54aa9581f019a802d2ec7dad':
  Add missing <string.h> include.
 2015-01-25 21:00:54 +00:00
Elliott HughesandAndroid Git Automerger 4db9c8935d am d4069928: Merge "Add missing <string.h> include." 
* commit 'd40699287fb659eca92b93dd325f82babcef77e6':
  Add missing <string.h> include.
 2015-01-25 20:42:51 +00:00
Elliott HughesandGerrit Code Review d40699287f Merge "Add missing <string.h> include." 2015-01-25 16:07:26 +00:00
Elliott Hughes e01d9de981 Add missing <string.h> include. 
Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
 2015-01-24 22:21:24 -08:00
Kenny RootandAndroid Git Automerger 267ec09d5d am e84e9310: am eade3a80: Merge "Remove superfluous OpenSSL include paths." 
* commit 'e84e931040a4f77aea14aca4c756940f3891d977':
  Remove superfluous OpenSSL include paths.
 2015-01-23 03:59:27 +00:00
Kenny RootandAndroid Git Automerger e84e931040 am eade3a80: Merge "Remove superfluous OpenSSL include paths." 
* commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239':
  Remove superfluous OpenSSL include paths.
 2015-01-23 01:20:52 +00:00
Kenny RootandGerrit Code Review eade3a800e Merge "Remove superfluous OpenSSL include paths." 2015-01-23 01:10:00 +00:00
Adam Langley 6ed899a9b6 Remove superfluous OpenSSL include paths. 
This include path was needed because system/vold/cryptfs.h included an
OpenSSL header just to get the length of a SHA-256 hash. This has been
fixed in https://android-review.googlesource.com/#/c/124477/1.

Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de
 2015-01-22 16:47:36 -08:00
Jesse ZhaoandAndroid Git Automerger ec4e95407e am 465e8702: am 5bf74b23: Bump up max_map_count value. 
* commit '465e8702912d06b7207878eb38b0df6f56f8bbb6':
  Bump up max_map_count value.
 2015-01-15 22:17:37 +00:00