Commit Graph

1040 Commits

Author SHA1 Message Date
Elliott Hughes 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
Elliott Hughes 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 Hughes 6a0d2fbcaa Merge "There's no GPL code in 'updater'." 2015-02-07 07:34:41 +00:00
Sami Tolvanen 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 Hughes 00f76246b2 am 40862ab5: am aeecac54: Merge "Add missing includes."
* commit '40862ab59e376d50036fa56a9f3f08c42530c96a':
  Add missing includes.
2015-01-30 21:28:06 +00:00
Elliott Hughes 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 Hughes 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 Hughes d2a4ef50ac am 22b8fe96: am dab56cac: Merge "Add missing includes."
* commit '22b8fe96663de518bf77049a1e449430b66e7d11':
  Add missing includes.
2015-01-28 22:08:20 +00:00
Elliott Hughes 22b8fe9666 am dab56cac: Merge "Add missing includes."
* commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3':
  Add missing includes.
2015-01-28 20:48:30 +00:00
Elliott Hughes 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 Albert 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 Albert 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 Albert eaeb55f745 Merge "Start losing code to libadb." 2015-01-27 00:51:09 +00:00
Christopher Ferris 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 Ferris 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 Ferris 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 Ferris cdc38d0401 Merge "Fix the v2 descriptor handling." 2015-01-26 21:28:21 +00:00
Christopher Ferris 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 Ferris 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 Sridharan 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 Hughes 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 Hughes 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 Hughes 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 Root 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 Root 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 Root 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 Zhao 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
Jesse Zhao 465e870291 am 5bf74b23: Bump up max_map_count value.
* commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f':
  Bump up max_map_count value.
2015-01-15 19:21:03 +00:00
Jesse Zhao 5bf74b238b Bump up max_map_count value.
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
2015-01-08 16:02:46 -08:00
Yabin Cui 5b84cf4056 am 479e5108: am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."
* commit '479e510811b8a81c47449faa8db6ed5d1d7a31b4':
  Use getmntent when accessing /proc/mounts.
2015-01-06 19:55:27 +00:00
Yabin Cui 479e510811 am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."
* commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67':
  Use getmntent when accessing /proc/mounts.
2015-01-06 04:36:24 +00:00
Yabin Cui dd719dfe4e Merge "Use getmntent when accessing /proc/mounts." 2015-01-06 04:24:58 +00:00
Dan Albert 1b103c4c0d am 6bec0e51: am a5d63956: Merge "Remove an uninitialized value."
* commit '6bec0e51b0974d5646bab925299ea37c221b47e3':
  Remove an uninitialized value.
2015-01-05 21:58:49 +00:00
Dan Albert 6bec0e51b0 am a5d63956: Merge "Remove an uninitialized value."
* commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a':
  Remove an uninitialized value.
2015-01-05 21:53:26 +00:00
Dan Albert a5d63956c4 Merge "Remove an uninitialized value." 2015-01-05 21:40:11 +00:00
Yabin Cui a382e2bdb2 Use getmntent when accessing /proc/mounts.
Bug: 18887435
Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
2015-01-02 14:00:13 -08:00
Elliott Hughes 0da6d563ad am 6bb8f476: am 538d7d83: Merge "Fix missing #includes in bootable/recovery."
* commit '6bb8f476862db17adb6f69b441af9059b01c9108':
  Fix missing #includes in bootable/recovery.
2014-12-30 12:36:30 +00:00
Elliott Hughes 6bb8f47686 am 538d7d83: Merge "Fix missing #includes in bootable/recovery."
* commit '538d7d838d82e29c738145431aa64c587dc84943':
  Fix missing #includes in bootable/recovery.
2014-12-30 12:29:31 +00:00
Elliott Hughes 538d7d838d Merge "Fix missing #includes in bootable/recovery." 2014-12-29 21:17:56 +00:00
Elliott Hughes d4d4c2456a Fix missing #includes in bootable/recovery.
Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
2014-12-29 12:46:43 -08:00
Dan Albert 7279f97ab4 Remove an uninitialized value.
The assignment of this value was removed in 0d32f25, but the
declaration was still there and still tested. Clang issues a warning
for this.

Change-Id: I748bfb8b4f78ceed1c1b5b1bb80cb4e873e4facc
2014-12-18 22:50:08 +00:00
Sungmin Choi 6a8a8b8746 am 8af7c5df: am a72512cd: Add O_CREAT option for open
* commit '8af7c5df575b1aef496694effea19700f6c71d65':
  Add O_CREAT option for open
2014-12-11 19:30:59 +00:00
Sungmin Choi 8af7c5df57 am a72512cd: Add O_CREAT option for open
* commit 'a72512cd058da7de4cdb667776ed47fad873f12c':
  Add O_CREAT option for open
2014-12-11 19:24:52 +00:00