PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,053 Commits 1 Branch 0 Tags
f81db4e1c09bd7721fc4d7eef99e96e57fbc0788
Commit Graph

2053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao f81db4e1c0 Merge "Change on-device directory for recovery test data" 
am: bd39fa7bdb

* commit 'bd39fa7bdb0ce4e55cada877084062f32f90edc2':
  Change on-device directory for recovery test data
 2016-02-08 20:01:34 +00:00
Tao Bao bd39fa7bdb Merge "Change on-device directory for recovery test data" 2016-02-08 19:45:35 +00:00
Yabin Cui ca78c9f035 resolve merge conflicts of 715d8a203a to master. 
Change-Id: Ic868ee9b27ef7251aa49ac814de7355ecd9c7d37
 2016-02-05 15:27:52 -08:00
Yabin Cui 715d8a203a Merge "applypatch: fix memory leaks reported by static analysis." 
am: 6b89aa7662

* commit '6b89aa7662186f940f2ae35d479598601dc28a07':
  applypatch: fix memory leaks reported by static analysis.
 2016-02-05 22:58:47 +00:00
Yabin Cui 6b89aa7662 Merge "applypatch: fix memory leaks reported by static analysis." 2016-02-05 22:54:36 +00:00
Jed Estep d5a14c6a49 Change on-device directory for recovery test data 
Test data needs to go outside the gtest module.

Change-Id: Ic444ca838cbafa651ec97ff8730129da84fafc09
 2016-02-05 11:49:20 -08:00
Tao Bao e284cd58c8 Merge "Refactor existing tests to use gtest" am: 38b02cc6a0 
am: 9865c55254

* commit '9865c55254a1583e18a7e8ac502f2c2143ed8b82':
  Refactor existing tests to use gtest
 2016-02-05 18:47:14 +00:00
Tao Bao 9865c55254 Merge "Refactor existing tests to use gtest" 
am: 38b02cc6a0

* commit '38b02cc6a097e6356f2369fc2b23c8c8a893e3ff':
  Refactor existing tests to use gtest
 2016-02-05 18:44:55 +00:00
Tao Bao 38b02cc6a0 Merge "Refactor existing tests to use gtest" 2016-02-05 18:41:01 +00:00
Yabin Cui 6ab3c817ff Merge "updater: fix memory leak based on static analysis." am: e50d447692 
am: 66b02c4ce5

* commit '66b02c4ce5b175451e723c463e6e9d19ab7872fa':
  updater: fix memory leak based on static analysis.
 2016-02-05 17:25:49 +00:00
Yabin Cui 66b02c4ce5 Merge "updater: fix memory leak based on static analysis." 
am: e50d447692

* commit 'e50d447692764cdb18107965c3ff3476d63b68ec':
  updater: fix memory leak based on static analysis.
 2016-02-05 02:50:26 +00:00
Yabin Cui e50d447692 Merge "updater: fix memory leak based on static analysis." 2016-02-05 02:46:23 +00:00
Yabin Cui d483c20a7e applypatch: fix memory leaks reported by static analysis. 
Bug: 26906416
Change-Id: I163df5a8f3abda3ba5d4ed81dfc8567054eceb27
 2016-02-04 15:42:02 -08:00
Yabin Cui 64be2135d8 updater: fix memory leak based on static analysis. 
Bug: 26907377
Change-Id: I384c0131322b2d12f0ef489735e70e86819846a4
 2016-02-04 14:49:06 -08:00
Tao Bao 50aa63f9bd resolve merge conflicts of 7b6027dde4 to master. 
Change-Id: I1d5232f61744bb18ca5de3a16a340bc3afd110bb
 2016-02-04 11:26:29 -08:00
Tao Bao 7b6027dde4 Merge "Switch from mincrypt to BoringSSL in applypatch and updater." 
am: 6e71c90fad

* commit '6e71c90fadbae68824116276d4dd536d962838f8':
  Switch from mincrypt to BoringSSL in applypatch and updater.
 2016-02-04 19:22:39 +00:00
Tao Bao 6e71c90fad Merge "Switch from mincrypt to BoringSSL in applypatch and updater." 2016-02-04 19:16:20 +00:00
Jed Estep 432918603f Refactor existing tests to use gtest 
Bug: 26962907
Change-Id: I5f80636af1740badeff7d08193f08e23f4e4fee1
 2016-02-04 10:11:30 -08:00
Sen Jiang c48cb5e597 Switch from mincrypt to BoringSSL in applypatch and updater. 
Bug: 18790686
Change-Id: I7d2136fb39b2266f5ae5be24819c617b08a6c21e
 2016-02-04 16:27:43 +08:00
Yabin Cui c342c60cb0 Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8 
am: 2ae24604d4

* commit '2ae24604d40d4d12b3c670064e027deaba3d8b69':
  uncrypt: add options to setup bcb and clear bcb.
 2016-02-03 19:00:11 +00:00
Yabin Cui 2ae24604d4 Merge "uncrypt: add options to setup bcb and clear bcb." 
am: e3434279c8

* commit 'e3434279c84846cfa49935638faef26ceb753b5e':
  uncrypt: add options to setup bcb and clear bcb.
 2016-02-03 18:57:53 +00:00
Yabin Cui e3434279c8 Merge "uncrypt: add options to setup bcb and clear bcb." 2016-02-03 18:52:52 +00:00
Yabin Cui 2d46da57e1 uncrypt: add options to setup bcb and clear bcb. 
Bug: 26696173

Change-Id: I3a612f045aaa9e93e61ae45b05300d02b19bb3ad
 2016-02-03 10:43:03 -08:00
Tao Bao 344f5c5c39 Merge "recovery: Refactor verifier and verifier_test." am: 351ddbbc0a 
am: b177ead3d7

* commit 'b177ead3d747d0565dd3e87bb2afa765ec7e54fc':
  recovery: Refactor verifier and verifier_test.
 2016-02-03 17:49:46 +00:00
Tao Bao b177ead3d7 Merge "recovery: Refactor verifier and verifier_test." 
am: 351ddbbc0a

* commit '351ddbbc0a8ff1257f5ad963c850204558a38d70':
  recovery: Refactor verifier and verifier_test.
 2016-02-03 17:43:28 +00:00
Tao Bao 351ddbbc0a Merge "recovery: Refactor verifier and verifier_test." 2016-02-03 17:16:56 +00:00
Tao Bao 71e3e09ec2 recovery: Refactor verifier and verifier_test. 
Move to using std::vector and std::unique_ptr to manage key
certificates to stop memory leaks.

Bug: 26908001
Change-Id: Ia5f799bc8dcc036a0ffae5eaa8d9f6e09abd031c
 2016-02-02 21:51:32 -08:00
Yabin Cui da5a5f80f4 Merge "uncrypt: generate map file by renaming tmp file." am: 4c07a7ec05 
am: 32ddaaacfd

* commit '32ddaaacfdf50994cdd535514b199ccdca896b89':
  uncrypt: generate map file by renaming tmp file.
 2016-02-02 00:19:36 +00:00
Yabin Cui 32ddaaacfd Merge "uncrypt: generate map file by renaming tmp file." 
am: 4c07a7ec05

* commit '4c07a7ec0557130b95fc1f69da818e83b0887d20':
  uncrypt: generate map file by renaming tmp file.
 2016-02-02 00:17:41 +00:00
Yabin Cui 4c07a7ec05 Merge "uncrypt: generate map file by renaming tmp file." 2016-02-02 00:12:21 +00:00
Yabin Cui 25dd0386fe uncrypt: generate map file by renaming tmp file. 
Writing map file directly can break consistency in map file if
it fails in the middle. Instead, we write a temporary file and
rename the temporary file to map file.

Bug: 26883096
Change-Id: I5e99e942e1b75e758af5f7a48f8a08a0b0041d6a
 2016-02-01 14:43:14 -08:00
Tao Bao 9fcb016109 Merge "Fix build." am: 9d72d4175b 
am: 2ab24d36b9

* commit '2ab24d36b91e28416a85e2c56442c22c984903ea':
  Fix build.
 2016-01-29 06:09:04 +00:00
Tao Bao 2ab24d36b9 Merge "Fix build." 
am: 9d72d4175b

* commit '9d72d4175b06a70c64c8867ff65b3c4c2181c9a9':
  Fix build.
 2016-01-29 06:06:58 +00:00
Tao Bao 9d72d4175b Merge "Fix build." 2016-01-29 06:01:32 +00:00
Tao Bao 8b0db11eba Fix build. 
Disable libimgpatch for non-Linux host.

Change-Id: Ib3615204b76564c691ddafaa29e59fef334d9d36
 2016-01-28 21:59:09 -08:00
Tao Bao 484c49e99e resolve merge conflicts of 725833e024 to master. 
Change-Id: I68b8737e3bc2bd7bffd7625114723bc1efa47398
 2016-01-28 20:58:59 -08:00
Sen Jiang 725833e024 Merge "applypatch: Compile libimgpatch for target and host." 
am: 1f3616f3fd

* commit '1f3616f3fd6c0e5cbbc3e490c216db9f758aeb28':
  applypatch: Compile libimgpatch for target and host.
 2016-01-29 04:38:56 +00:00
Sen Jiang 1f3616f3fd Merge "applypatch: Compile libimgpatch for target and host." 2016-01-29 04:35:05 +00:00
Sen Jiang 0cce9cda0c applypatch: Compile libimgpatch for target and host. 
update_engine need it for the new IMGDIFF operation.

Also removed __unused in ApplyImagePatch() as I got error building it
for the host, and I think it's dangerous not checking the size of the
input.

Test: mma
Bug: 26628339

Change-Id: I22d4cd55c2c3f87697d6afdf10e8106fef7d1a9c
 2016-01-28 13:26:25 +08:00
Yabin Cui a7e7cef949 Merge "edify: accept long string literal." am: d379b4410b 
am: bb0e2754ac

* commit 'bb0e2754ac40dfceaee670e1214dce0c70fc5c51':
  edify: accept long string literal.
 2016-01-27 23:25:44 +00:00
Yabin Cui bb0e2754ac Merge "edify: accept long string literal." 
am: d379b4410b

* commit 'd379b4410b6f7c7f08751709d08ba6f819acf69d':
  edify: accept long string literal.
 2016-01-27 23:23:53 +00:00
Yabin Cui d379b4410b Merge "edify: accept long string literal." 2016-01-27 23:05:57 +00:00
Yabin Cui 12f499e86d edify: accept long string literal. 
Bug: 24717917
Change-Id: I134cf00ae7efbc3703f976459a1b9f9a197e495d
 2016-01-27 12:26:18 -08:00
Tao Bao 59f2815145 Merge "Change BCB to perform synchronous writes." am: 5797bf9c90 
am: e51d0b4d38

* commit 'e51d0b4d3867e740cb86e4830cdbcb3d4be473e8':
  Change BCB to perform synchronous writes.
 2016-01-22 18:46:07 +00:00
Tao Bao e51d0b4d38 Merge "Change BCB to perform synchronous writes." 
am: 5797bf9c90

* commit '5797bf9c90055b9ebbc5fe29e9542a798f359bc7':
  Change BCB to perform synchronous writes.
 2016-01-22 17:27:38 +00:00
Tao Bao 5797bf9c90 Merge "Change BCB to perform synchronous writes." 2016-01-22 17:23:17 +00:00
Tao Bao bd82b27341 Change BCB to perform synchronous writes. 
Also some trivial clean-ups in bootloader control block (BCB) code.

Change-Id: I42828954caa4d08998310de40fd0391f76d99cbe
 2016-01-21 14:49:13 -08:00
Tao Bao b595e1722c Merge "recovery: Fork a process for fuse when sideloading from SD card." am: 37e3c71da3 
am: ce46828e08

* commit 'ce46828e08281dc507d4e40ba9e8b770bc21cf0b':
  recovery: Fork a process for fuse when sideloading from SD card.
 2016-01-14 20:19:31 +00:00
Tao Bao ce46828e08 Merge "recovery: Fork a process for fuse when sideloading from SD card." 
am: 37e3c71da3

* commit '37e3c71da32f476e2658c57d0576e8f94e696ba1':
  recovery: Fork a process for fuse when sideloading from SD card.
 2016-01-14 18:29:05 +00:00
Tao Bao 37e3c71da3 Merge "recovery: Fork a process for fuse when sideloading from SD card." 2016-01-14 18:25:54 +00:00