PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
919 Commits 1 Branch 0 Tags
6ee44c8aaf26cdd0b43905fb73bbfb9f4249d82f
Commit Graph
919 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan AlbertandAndroid Git Automerger 6ee44c8aaf am 440185cd: am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" 
* commit '440185cdd383289fbf8afec353aa64fe0ed30773':
 2014-10-23 15:07:57 +00:00
Jeff SharkeyandAndroid Git Automerger 8e76d2b005 am 39705685: am e95ed95f: am a6e13ae0: Include reason when wiping data. 
* commit '3970568560f62c87d9ef7a1c0617c16b23271b6e':
 2014-10-23 15:07:57 +00:00
Elliott HughesandAndroid Git Automerger 50758abdc8 am e5ce559f: am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb." 
* commit 'e5ce559fb620ddea535b428d4cc21da701a5e4e7':
 2014-10-23 15:07:56 +00:00
Dan AlbertandAndroid Git Automerger 440185cdd3 am ea5828a2: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" 
* commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':
 2014-10-23 13:04:57 +00:00
Jeff SharkeyandAndroid Git Automerger 3970568560 am e95ed95f: am a6e13ae0: Include reason when wiping data. 
* commit 'e95ed95f05d22929e0bb8610a83c4e6a01fb3a33':
 2014-10-23 13:04:56 +00:00
Elliott HughesandAndroid Git Automerger e5ce559fb6 am 78a30278: am 530b61e0: Merge "Copy epoll(2) changes to minadb." 
* commit '78a30278607f0e57ace53eb5df7e5f7f196387a4':
 2014-10-23 13:04:56 +00:00
JP AbgrallandAndroid Git Automerger a7a0ed94a2 am dd57886c: am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests 
* commit 'dd57886ce6ec100ce212b7d8d1f6991a4b77e004':
  init.rc: Inidicate that booting is complete wrt firwmare requests
 2014-10-21 17:48:18 +00:00
JP AbgrallandAndroid Git Automerger dd57886ce6 am 9eb8c8bd: init.rc: Inidicate that booting is complete wrt firwmare requests 
* commit '9eb8c8bdbe4965e9a92d83882e97cf67aee20821':
  init.rc: Inidicate that booting is complete wrt firwmare requests
 2014-10-21 17:42:56 +00:00
JP Abgrall 9eb8c8bdbe init.rc: Inidicate that booting is complete wrt firwmare requests 
ueventd will wait for /dev/.booting to go away before giving up
on loading firmware.
The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710
which forgot to update recovery's init.rc

Bug: 17993625
Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
 2014-10-20 20:02:57 -07:00
Dan AlbertandAndroid Git Automerger 92fb368036 am 5b7f5b15: am 4f66469b: Merge "More test makefile cleanup." 
* commit '5b7f5b15af016299e10d18979ec65720ab447786':
  More test makefile cleanup.
 2014-10-17 07:53:34 +00:00
Dan AlbertandAndroid Git Automerger 5b7f5b15af am 4f66469b: Merge "More test makefile cleanup." 
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
  More test makefile cleanup.
 2014-10-17 07:48:06 +00:00
Dan AlbertandGerrit Code Review 4f66469b29 Merge "More test makefile cleanup." 2014-10-17 01:28:35 +00:00
Dan Albert 13f21c2bc7 More test makefile cleanup. 
Global variables kill.
No need to manually link gtest, and that causes problems with
libc++.

Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6
 2014-10-17 01:05:08 +00:00
Dan AlbertandAndroid Git Automerger b94b25bce9 am 93ecb938: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" 
* commit '93ecb9383a22c6828c9b332b7d1089ff97319999':
  Revert "Copy epoll(2) changes to minadb."
 2014-09-26 19:39:37 +00:00
Dan AlbertandAndroid Git Automerger 93ecb9383a am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" 
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
  Revert "Copy epoll(2) changes to minadb."
 2014-09-26 16:12:34 +00:00
Dan AlbertandAndroid Git Automerger ea5828a24f am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb."" 
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
  Revert "Copy epoll(2) changes to minadb."
 2014-09-26 16:12:23 +00:00
Dan AlbertandGerrit Code Review 28ffde5ebd Merge "Revert "Copy epoll(2) changes to minadb."" 2014-09-26 16:04:16 +00:00
Doug ZongkerandAndroid Git Automerger 7a054ec9a7 am 91c27888: am d83e4f15: support for version 2 of block image diffs 
* commit '91c27888517c514d1da8cbcd76fdc4b437d193f8':
  support for version 2 of block image diffs
 2014-09-26 15:39:46 +00:00
Doug ZongkerandAndroid Git Automerger 91c2788851 am d83e4f15: support for version 2 of block image diffs 
* commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad':
  support for version 2 of block image diffs
 2014-09-26 14:54:01 +00:00
Doug Zongker d83e4f1589 support for version 2 of block image diffs 
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.

This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all.  This comes at the cost of the RAM or scratch disk needed to
store the data.

The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.

Change-Id: I4559bfd76d5403859637aeac832f3a5e9e13b63a
 2014-09-25 16:38:14 -07:00
Dan Albert f420f8eb63 Revert "Copy epoll(2) changes to minadb." 
This reverts commit db8c959049.
 2014-09-25 15:12:19 -07:00
Jeff SharkeyandAndroid Git Automerger 79174dd192 am 62656652: am a6e13ae0: Include reason when wiping data. 
* commit '6265665282a913a545606f4e8a20de8c57c3ae84':
  Include reason when wiping data.
 2014-09-25 17:19:11 +00:00
Jeff SharkeyandAndroid Git Automerger 6265665282 am a6e13ae0: Include reason when wiping data. 
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
  Include reason when wiping data.
 2014-09-25 17:06:24 +00:00
Jeff SharkeyandAndroid Git Automerger e95ed95f05 am a6e13ae0: Include reason when wiping data. 
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
  Include reason when wiping data.
 2014-09-24 23:35:38 +00:00
Jeff Sharkey a6e13ae01b Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
 2014-09-24 11:46:17 -07:00
Elliott HughesandAndroid Git Automerger 632bf8668a am 970c3947: am 530b61e0: Merge "Copy epoll(2) changes to minadb." 
* commit '970c3947f39e8c880dd9f32002f9c7a9cdc96d54':
  Copy epoll(2) changes to minadb.
 2014-09-23 20:56:38 +00:00
Elliott HughesandAndroid Git Automerger 970c3947f3 am 530b61e0: Merge "Copy epoll(2) changes to minadb." 
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
  Copy epoll(2) changes to minadb.
 2014-09-23 18:57:44 +00:00
Elliott HughesandAndroid Git Automerger 78a3027860 am 530b61e0: Merge "Copy epoll(2) changes to minadb." 
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
  Copy epoll(2) changes to minadb.
 2014-09-23 18:57:39 +00:00
Elliott HughesandGerrit Code Review 530b61e0b5 Merge "Copy epoll(2) changes to minadb." 2014-09-23 18:36:34 +00:00
Elliott Hughes db8c959049 Copy epoll(2) changes to minadb. 
Bug: 17588403
Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2
 2014-09-23 10:50:55 -07:00
Christopher Ferris 1d30c2fe19 Use the correct fuse_init_out structure size. 
Kernel 2.6.16 is the first stable kernel with struct fuse_init_out
defined (fuse version 7.6). The structure is the same from 7.6 through
7.22. Beginning with 7.23, the structure increased in size and added
new parameters.

If the kernel only works on minor revs older than or equal to 22,
then use the older structure size since this code only uses the 7.22
version of the structure.

Change-Id: I00d7530e01e6b4718dcd04ad2484959d12ef4a65
 2014-09-17 17:10:41 -07:00
Doug Zongker 52ae67d659 support for version 2 of block image diffs 
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.

This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all.  This comes at the cost of the RAM or scratch disk needed to
store the data.

The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.

Change-Id: I7fafe741d86b92d82d46feb2939ecf5a3890dc64
 2014-09-08 14:11:48 -07:00
Doug ZongkerandAndroid Git Automerger 3de5e7cc0b am 574443d8: create block map for all update packages on /data 
* commit '574443d8956802f35347cac7fae7eb16240e3c16':
  create block map for all update packages on /data
 2014-09-05 17:24:50 +00:00
Doug Zongker 574443d895 create block map for all update packages on /data 
Always create the block map for packages on /data; don't only look at
the encryptable/encrypted flags.

Bug: 17395453
Change-Id: Iaa7643a32898328277841e324305b9419a9e071c
 2014-09-05 08:22:12 -07:00
Doug ZongkerandAndroid Git Automerger 795f9bca63 am 40482ea2: Merge "fix comment in blockimg updater code" into lmp-dev 
* commit '40482ea2ae5ca8cbcf46125f601c0bc766f99943':
  fix comment in blockimg updater code
 2014-09-04 15:49:21 +00:00
Andrew BoieandAndroid Git Automerger da8b8049db am 8328922f: use lseek64 instead of lseek 
* commit '8328922ff040280007da0aaaf8b567581231d5ed':
  use lseek64 instead of lseek
 2014-09-04 15:49:20 +00:00
Doug ZongkerandAndroid (Google) Code Review 40482ea2ae Merge "fix comment in blockimg updater code" into lmp-dev 2014-09-04 15:26:29 +00:00
Doug Zongker f7bb09dae8 fix comment in blockimg updater code 
The comment for the DEBUG_ERASE setting is exactly backwards.

Change-Id: I98ab5828365894217fc78976817a131e7d22d5c1
 2014-09-04 08:10:32 -07:00
Andrew BoieandDoug Zongker 8328922ff0 use lseek64 instead of lseek 
Otherwise, overflow problems can occur with images larger than
2G since the offsets will overflow a 32-bit off_t.

Change-Id: I05951a38ebeae83ad2cb938594e8d8adb323e2aa
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
 2014-09-04 07:54:17 -07:00
Doug ZongkerandAndroid Git Automerger 5a1bc7a233 am 5f875bf5: remove code for original block OTA mechanism 
* commit '5f875bf57739bf0b5c2d182173513233bdb71ab8':
  remove code for original block OTA mechanism
 2014-08-26 22:11:36 +00:00
Doug Zongker 5f875bf577 remove code for original block OTA mechanism 
Superseded by newer code.

Bug: 16984795
Change-Id: I842299f6a02af7ccf51ef2ca174d813ca53deef1
 2014-08-26 13:54:24 -07:00
Doug ZongkerandAndroid (Google) Code Review 9e62b78b36 Merge "remove code for original block OTA mechanism" 2014-08-26 17:05:30 +00:00
Doug ZongkerandAndroid Git Automerger 7b485070e0 am f449db2f: open misc device in write-only mode 
* commit 'f449db2f30235a0c2fef4bc7bc41776e271a60a0':
  open misc device in write-only mode
 2014-08-26 16:47:27 +00:00
Doug Zongker f449db2f30 open misc device in write-only mode 
Opening the misc block device in read-write mode runs afoul of
SELinux, which keeps the wipe code from working.  Fix.  Also change
various things to log to logcat so we can see them happening, for
future debugging.

Bug: 16715412
Change-Id: Ia14066f0a371cd605fcb544547b58a41acca70b9
 2014-08-26 09:22:57 -07:00
Doug Zongker adad8ec045 remove code for original block OTA mechanism 
Superseded by newer code.

Bug: 16984795
Change-Id: I70c1d29dc03287b06ea909d17f729ec51ccb0344
 2014-08-25 08:21:27 -07:00
Doug ZongkerandAndroid Git Automerger 6d3c4e8224 am 1d5d6098: fix two bugs in block image updater 
* commit '1d5d6098f4a470bc8e56ae8914180041815e6e22':
  fix two bugs in block image updater
 2014-08-21 18:20:18 +00:00
Doug Zongker 1d5d6098f4 fix two bugs in block image updater 
The computation of file offsets was overflowing for partitions larger
than 2 GB.  The parsing of the transfer file could fail at the end if
the data happened to not be properly null-terminated.

Bug: 16984795
Change-Id: I3ce6eb3e54ab7b55aa9bbed252da5a7eacd3317a
 2014-08-21 10:47:24 -07:00
Doug ZongkerandAndroid Git Automerger 0f5cf72f54 am bc7ffeda: installer for new block OTA system 
* commit 'bc7ffeda98a861e346c30c771d3258030f7fcf21':
  installer for new block OTA system
 2014-08-20 01:33:48 +00:00
Doug Zongker bc7ffeda98 installer for new block OTA system 
(Cherry-pick back from master.)

Bug: 16984795
Change-Id: Ifa3d8345c5e2a0be86fb28faa080ca82592a96b4
 2014-08-19 16:53:39 -07:00
Doug ZongkerandAndroid (Google) Code Review c0fd40159c Merge "installer for new block OTA system" 2014-08-19 02:43:23 +00:00