25bbde071b
merge in lmp-mr1-release history after reset to 574443d895
2014-09-25 06:09:39 -07:00
f55264dace
merge in lmp-mr1-release history after reset to 574443d895
2014-09-24 06:09:56 -07:00
d0acb96eab
merge in lmp-mr1-release history after reset to 574443d895
2014-09-23 15:13:52 -07:00
f85e0ddf03
merge in lmp-mr1-release history after reset to 574443d895
2014-09-23 04:45:30 -07:00
ca58d2c010
merge in lmp-mr1-release history after reset to 574443d895
2014-09-22 11:44:31 -07:00
b79f5f8aed
merge in lmp-mr1-release history after reset to 574443d895
2014-09-22 11:13:43 -07:00
136c97c93b
merge in lmp-mr1-release history after reset to 574443d895
2014-09-22 10:17:01 -07:00
a160ad7ef6
merge in lmp-release history after reset to 574443d895
2014-09-15 06:09:48 -07:00
4cd02aeaeb
merge in lmp-release history after reset to 574443d895
2014-09-14 06:09:36 -07:00
c02b9ef11f
merge in lmp-release history after reset to 5e238a9971
2014-09-13 08:42:01 -07:00
9bcc1875c0
merge in lmp-release history after reset to 574443d895
2014-09-13 06:09:54 -07:00
5e238a9971
merge in lmp-release history after reset to 574443d895
2014-09-11 06:09:10 -07:00
f6eb389525
merge in lmp-release history after reset to 574443d895
2014-09-10 06:09:16 -07:00
4fc827e933
merge in lmp-release history after reset to 574443d895
2014-09-09 06:09:24 -07:00
9c574d1d2a
merge in lmp-release history after reset to 574443d895
2014-09-08 06:09:43 -07:00
500c1fb27c
merge in lmp-release history after reset to 574443d895
2014-09-07 06:08:57 -07:00
c398172f94
merge in lmp-release history after reset to f9bc2a544d
2014-09-06 08:50:41 -07:00
9132bd040b
merge in lmp-release history after reset to 574443d895
2014-09-06 06:08:47 -07:00
f9bc2a544d
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 13:06:47 -07:00
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
40482ea2ae
Merge "fix comment in blockimg updater code" into lmp-dev
2014-09-04 15:26:29 +00:00
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
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
603a1609fb
merge in lmp-release history after reset to 5f875bf577
2014-09-04 06:09:32 -07:00
41f13f4276
merge in lmp-release history after reset to 5f875bf577
2014-09-03 06:09:06 -07:00
cdbd52f5a3
merge in lmp-release history after reset to 5f875bf577
2014-09-02 06:09:10 -07:00
c7709c56c2
merge in lmp-release history after reset to 5f875bf577
2014-09-01 07:54:47 -07:00
afe031d2ca
merge in lmp-release history after reset to 5f875bf577
2014-08-31 09:30:23 -07:00
5e7308a59c
merge in lmp-release history after reset to 5f875bf577
2014-08-27 06:09:32 -07:00
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
ff14eb2895
merge in lmp-release history after reset to lmp-dev
2014-08-26 11:14:05 -07:00
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
22427ff6d2
merge in lmp-release history after reset to 1d5d6098f4
2014-08-26 06:09:10 -07:00
8315f88e6d
merge in lmp-release history after reset to 1d5d6098f4
2014-08-25 06:08:47 -07:00
19eeee5a9e
merge in lmp-release history after reset to 1d5d6098f4
2014-08-24 06:08:25 -07:00
796e556e8f
merge in lmp-release history after reset to 1d5d6098f4
2014-08-23 06:09:07 -07:00
f2127b6435
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 14:51:41 -07:00
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
314b3e31c3
merge in lmp-release history after reset to bc7ffeda98
2014-08-21 06:09:27 -07:00
c96ad7837b
merge in lmp-release history after reset to bc7ffeda98
2014-08-20 06:08:55 -07:00
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
7f48b43e23
merge in lmp-release history after reset to 2efc9d994c
2014-08-19 06:08:53 -07:00
2efc9d994c
clear BCB in misc partition before rebooting
...
Something is leaving behind wipe commands in the BCB area of the /misc
partition. We don't know what is doing that. It should always be
safe to zero out that area from uncrypt, though (because if uncrypt is
running then it's got the command we want in the recovery command file
rather than the BCB).
Bug: 16715412
Change-Id: Iad01124287f13b80ff71d6371db6371f43c43211
2014-08-18 15:55:28 -07:00
e5645ff3a2
merge in lmp-release history after reset to 1a35a58690
2014-08-18 06:08:42 -07:00
3c5bfe5b58
merge in lmp-release history after reset to 1a35a58690
2014-08-17 07:14:35 -07:00
1a35a58690
revert uncrypt back to dynamic linking, fix libs
...
Bug: 17029174, 17015157
Change-Id: I1d24f3402875dfb972daa6daef0f385baeff84e9
2014-08-14 10:32:46 -07:00
64be82755c
change uncrypt to static linking
...
Bug: 17015157
Change-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c
2014-08-14 09:15:23 -07:00
537d34f907
change uncrypt to static linking
...
Bug: 17015157
Change-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c
2014-08-14 08:01:17 -07:00
9dc71cfa52
Merge "Erase PST partition if its marked to be erased." into lmp-dev
2014-08-05 00:34:22 +00:00
ee19387905
Erase PST partition if its marked to be erased.
...
We need to wipe the challenges on this partition
if OEM unlock is enabled, as this is a signal that
the user has opted out of factory reset protection.
go/factory-reset
Bug: 16633064
Change-Id: Icb8f1433bf99ca57813f5b72d5a3dd15fa94a263
2014-08-06 09:58:55 -07:00
The Android Automerger
Doug Zongker
Andrew Boie
Andres Morales