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

2604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 2dbd0f4da9 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" 2016-06-01 21:40:44 +00:00
Tao Bao 65f98cbc44 Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." 
This reverts commit 51dc9444bc.

A new/free mismatch may lead to memory corruptions.

Change-Id: I3e10ae9e514abe59c351d2f27bedd3f8fcd1d137
 2016-06-01 21:40:20 +00:00
Adam Buchbinder 8668045bc5 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 am: 23bb1d210d 
am: 150c500641

* commit '150c500641a835153f6e707d451001cb122b6019':
  Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.

Change-Id: I9e3a208ca982be5332e4e05cb2985593b336c9a4
 2016-06-01 20:06:53 +00:00
Adam Buchbinder 150c500641 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7 
am: 23bb1d210d

* commit '23bb1d210d2f08d6789fefa69aa3b70714164983':
  Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.

Change-Id: Id3e7bd4462b2676e9a5927dd1b3466d9aa539e19
 2016-06-01 19:12:43 +00:00
Adam Buchbinder 23bb1d210d Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 
am: 11c794b1a7

* commit '11c794b1a7b02d074367f4c8d1f2017f8ac7d8e9':
  Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.

Change-Id: Ie3b21e9b2288011bcf9d3bac12aed3db831b410e
 2016-06-01 19:03:06 +00:00
Adam Buchbinder 11c794b1a7 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." 
am: a8850710e5

* commit 'a8850710e588e7c6c0003066bae6edd426558059':
  Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.

Change-Id: I8363d2f5adbabc5c4a43d23aa7c2e6979ffd1bb5
 2016-06-01 18:48:55 +00:00
Treehugger Robot a8850710e5 Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." 2016-06-01 18:24:15 +00:00
Adam Buchbinder 50a6f8c833 Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. 
This fixes the following cppcheck reports:
[imgdiff.cpp:197]: (error) Memory leak: img
[imgdiff.cpp:386]: (error) Memory leak: img
[imgdiff.cpp:656]: (error) Memory leak: data
[imgdiff.cpp:664]: (error) Memory leak: data
[imgdiff.cpp:668]: (error) Memory leak: data
[imgdiff.cpp:668]: (error) Resource leak: f
[imgdiff.cpp:820]: (error) Memory leak: bonus_data
[imgdiff.cpp:824]: (error) Memory leak: bonus_data
[imgdiff.cpp:824]: (error) Resource leak: f
[imgdiff.cpp:847]: (error) Memory leak: bonus_data
[imgdiff.cpp:851]: (error) Memory leak: bonus_data
[imgdiff.cpp:856]: (error) Memory leak: bonus_data
[imgdiff.cpp:860]: (error) Memory leak: bonus_data
[imgdiff.cpp:227]: (error) Memory leak: temp_entries

Change-Id: I06f878d0b677a25328e0deb84f65f3b7212e24b1
(cherry picked from commit 51dc9444bc)
 2016-06-01 10:28:45 -07:00
Tao Bao 2df6545e56 Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf am: d8a518d711 
am: 50b793e139

* commit '50b793e139cc2b1d479fd3d50ec86975d3b6b19b':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: I0043d779a4a035774a5ff4c6845c31d6c7b500a3
 2016-06-01 00:26:22 +00:00
Tao Bao 50b793e139 Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf 
am: d8a518d711

* commit 'd8a518d711f6958c04c28e4ee767121c201f2d9a':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: I47db6e16750e4f4c0cfa56b076871fd6729bce48
 2016-06-01 00:23:16 +00:00
Tao Bao d8a518d711 Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb 
am: fd49adbdaf

* commit 'fd49adbdaf3639b7e4565c6ef67bb060612e26c4':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: Id391b970b3f7cda5ead0cb469b2d09379059e89d
 2016-06-01 00:19:34 +00:00
Tao Bao fd49adbdaf Merge "Revert "imgdiff: Generate statically linked imgdiff."" 
am: 59203510eb

* commit '59203510eb5827ec36078e54076c809f82641821':
  Revert "imgdiff: Generate statically linked imgdiff."

Change-Id: I5671a20ed1f01a61dfb36ecd0ad4db3002ca5045
 2016-06-01 00:16:24 +00:00
Tao Bao 59203510eb Merge "Revert "imgdiff: Generate statically linked imgdiff."" 2016-06-01 00:09:19 +00:00
Tao Bao 16e3861c84 Revert "imgdiff: Generate statically linked imgdiff." 
This reverts commit b4422bd769.

Bug: 28941046
Change-Id: Ic3c7439c64b8e55832252850514f721a944993d6
 2016-06-01 00:08:40 +00:00
Tao Bao 64a59cd7bf Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 am: f90090d429 
am: 197e4afea4

* commit '197e4afea4600599ee18c83428cc25d2ce5fc6ca':
  imgdiff: Generate statically linked imgdiff.

Change-Id: I7ac7ab9d25cb95ced69d98d4c33349a2590a446a
 2016-05-31 23:00:28 +00:00
Tao Bao 197e4afea4 Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57 
am: f90090d429

* commit 'f90090d4298e3a3a89f24a76199a93838b08db89':
  imgdiff: Generate statically linked imgdiff.

Change-Id: I38e6ba8e896d7bfe97351673a1f5e5da1ff4708f
 2016-05-31 22:57:04 +00:00
Tao Bao f90090d429 Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc 
am: a83b798c57

* commit 'a83b798c57e10301bca4486ca42e0cabaee5d188':
  imgdiff: Generate statically linked imgdiff.

Change-Id: Ib51333ea8a0d3d533777198a58ea987af31ebed4
 2016-05-31 22:54:09 +00:00
Tao Bao a83b798c57 Merge "imgdiff: Generate statically linked imgdiff." 
am: 680d783ecc

* commit '680d783eccbc6b1154495a5040e6483f1f42bb89':
  imgdiff: Generate statically linked imgdiff.

Change-Id: Icdf693eacf655d38e1dcceb76ea9e2742e965b2f
 2016-05-31 22:51:16 +00:00
Tao Bao 680d783ecc Merge "imgdiff: Generate statically linked imgdiff." 2016-05-31 22:42:13 +00:00
Tao Bao b4422bd769 imgdiff: Generate statically linked imgdiff. 
Bug: 28941046
Change-Id: If3019d8cff91fd4f6fa4516bef5a0f51c2ddebc7
 2016-05-30 21:53:11 -07:00
Adam Buchbinder 51dc9444bc Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector. 
This fixes the following cppcheck reports:
[imgdiff.cpp:197]: (error) Memory leak: img
[imgdiff.cpp:386]: (error) Memory leak: img
[imgdiff.cpp:656]: (error) Memory leak: data
[imgdiff.cpp:664]: (error) Memory leak: data
[imgdiff.cpp:668]: (error) Memory leak: data
[imgdiff.cpp:668]: (error) Resource leak: f
[imgdiff.cpp:820]: (error) Memory leak: bonus_data
[imgdiff.cpp:824]: (error) Memory leak: bonus_data
[imgdiff.cpp:824]: (error) Resource leak: f
[imgdiff.cpp:847]: (error) Memory leak: bonus_data
[imgdiff.cpp:851]: (error) Memory leak: bonus_data
[imgdiff.cpp:856]: (error) Memory leak: bonus_data
[imgdiff.cpp:860]: (error) Memory leak: bonus_data
[imgdiff.cpp:227]: (error) Memory leak: temp_entries

Change-Id: I06f878d0b677a25328e0deb84f65f3b7212e24b1
 2016-05-26 14:06:10 -07:00
Elliott Hughes 08e5801c01 Disable the meaningless parts of the UI for A/B. am: 01fcbe160b 
am: 994bacf549

* commit '994bacf5496ba07240f70611b6c565f0dc24ca0c':
  Disable the meaningless parts of the UI for A/B.

Change-Id: Iee8df4e288d3909612a71e6af062af7fa8c4b934
 2016-05-24 17:19:28 +00:00
Elliott Hughes 994bacf549 Disable the meaningless parts of the UI for A/B. 
am: 01fcbe160b

* commit '01fcbe160bd49891c0680b80c5688cd4feb2adbc':
  Disable the meaningless parts of the UI for A/B.

Change-Id: I86466cac3623b62db07bf48a38428be715ac3d3a
 2016-05-24 17:12:58 +00:00
Tianjie Xu 918add26fe resolve merge conflicts of 50f6417 am: 3f6eb86390 
am: f51e507fa7

* commit 'f51e507fa714c7e00c70539d9c57723fc2ea060a':
  resolve merge conflicts of 50f6417

Change-Id: I2f44ff16dd4471d7944371f94508637171b80a6e
 2016-05-24 01:19:37 +00:00
Jeremy Compostella be04a5efa2 Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 am: f5e2831bf3 
am: 1afd591a09

* commit '1afd591a09cee35d0cafac3c1d7f236fe28cf274':
  slot_metadata: add verity_corrupted field

Change-Id: Ic61d0514a8f224f35fe172b1056c6adb8bbc253c
 2016-05-24 01:19:36 +00:00
Tianjie Xu 9bedd1a003 resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp 
am: 79c13cee26

* commit '79c13cee260ebca72752439353fa739aa6f3230f':

Change-Id: Ie0322322b0ff1768bb6b4c85c4d0c638a1a850ab
 2016-05-24 01:19:35 +00:00
Tianjie Xu f51e507fa7 resolve merge conflicts of 50f6417 
am: 3f6eb86390

* commit '3f6eb86390e27707d1204e60e33b6a41e88f0dc8':
  resolve merge conflicts of 50f6417

Change-Id: Id8410b617d811dccfa0979cf82859c4880d216d5
 2016-05-24 01:17:02 +00:00
Jeremy Compostella 1afd591a09 Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 
am: f5e2831bf3

* commit 'f5e2831bf32fe1c0069c3c7bbeda876dbb83fe0a':
  slot_metadata: add verity_corrupted field

Change-Id: I3a2c24a80e53a28fa7b56c64df5fc10ee7414f24
 2016-05-24 01:17:01 +00:00
Tianjie Xu 79c13cee26 resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp 
Change-Id: I84ed9e14d3103e5497a6d57fde0abafe9265a148
 2016-05-23 18:13:58 -07:00
Elliott Hughes 01fcbe160b Disable the meaningless parts of the UI for A/B. 
Bug: http://b/28748484
Change-Id: Ie86a265f4699503471e7c717d65677a916dbd25b
 2016-05-24 00:44:50 +00:00
Tianjie Xu 3f6eb86390 resolve merge conflicts of 50f6417 
Fix a typo for ota_fclose().

Change-Id: Ia93e911aa5391afc604874fc3a09c5a45c094c80
 2016-05-23 14:58:53 -07:00
Tianjie Xu 8a43084979 resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp 
am: 549745cc87

* commit '549745cc8778f806e46809e472fbcf3c7f066b83':
  Allow recovery to return error codes

Change-Id: I474bc0afb4e92ffafec9de60e1665e3aa3c2cf10
 2016-05-23 21:28:44 +00:00
Jeremy Compostella f5e2831bf3 Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c 
am: 1ae2434c11

* commit '1ae2434c117a3cd0b504e3f3ad24730577836a69':
  slot_metadata: add verity_corrupted field

Change-Id: I8c7bca4f0bb41268904d09309ef1b94215c24bc8
 2016-05-23 21:22:07 +00:00
Jeremy Compostella 1ae2434c11 Merge "slot_metadata: add verity_corrupted field" 
am: 3788001b2c

* commit '3788001b2c8a37e4111c9bc584a18a52664c2a88':
  slot_metadata: add verity_corrupted field

Change-Id: Ib8c0ad4f7bb605b1b7420affcd102bf1eb9f47db
 2016-05-23 21:18:55 +00:00
Treehugger Robot 3788001b2c Merge "slot_metadata: add verity_corrupted field" 2016-05-23 21:10:16 +00:00
Tianjie Xu 549745cc87 resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp 
Change-Id: I834aba65cb29102055ff9e70969973a7870d0e60
 2016-05-23 12:30:42 -07:00
Tianjie Xu 84478e8823 resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp 
Change-Id: I42c127f7946e678acf6596f6352f090abc0ca019
 2016-05-23 12:24:28 -07:00
Tianjie Xu 3aabd770d9 Merge "Allow recovery to return error codes" into nyc-dev 
am: 50f6417317

* commit '50f6417317f9e327ed76abaf34512370f8376245':
  Allow recovery to return error codes

Change-Id: I4613291b3b4a0c34d5e6999f240465237472302e
 2016-05-23 18:15:40 +00:00
Tianjie Xu 50f6417317 Merge "Allow recovery to return error codes" into nyc-dev 2016-05-23 18:03:41 +00:00
Jeremy Compostella e77a68f67f slot_metadata: add verity_corrupted field 
In rootfs context, the verity mode must be supplied by the bootloader
to the kernel.  This patch creates a new verity_corrupted field in the
slot metadata structure to remind that this slot is corrupted from a
dm-verity point of view.

If the bootloader receives the "dm-verity device corrupted" reboot
target, it should set this bit to 1.  If this bit value is 1, the
bootloader should set the veritymode to "eio".

Change-Id: I9335a39d7d009200318c58c53a3139d542788a9b
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
 2016-05-23 13:10:23 +02:00
Tianjie Xu 162558382b Allow recovery to return error codes 
Write error code, cause code, and retry count into last_install. So we
can have more information about the reason of a failed OTA.

Example of new last_install:
@/cache/recovery/block.map     package name
0                              install result
retry: 1                       retry count (new)
error: 30                      error code (new)
cause: 12                      error cause (new)

Details in:
go/android-ota-errorcode

Bug: 28471955
Change-Id: I00e7153c821e7355c1be81a86c7f228108f3dc37
 2016-05-20 13:56:53 -07:00
Matt Sarett c466c70ddf resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: bd43d7e92b 
am: 9ca6bac199

* commit '9ca6bac1996e2210f35202b0d05738e8d0d951c0':

Change-Id: I965414ad387bffd703e8c3bedc523beee43456c4
 2016-05-20 00:07:29 +00:00
Matt Sarett cfb45bd7b9 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a am: 8a55c65345 
am: b898481de7

* commit 'b898481de7f2d3d7617da04a58aa320e58aa72a4':
  DO NOT MERGE Use updated libpng API

Change-Id: I5cdfad96ed0a6ffde2c197ef7957192d9b0c1a16
 2016-05-20 00:07:25 +00:00
Matt Sarett 9ca6bac199 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a 
am: bd43d7e92b

* commit 'bd43d7e92bec3b69f8318d74cd11936a622efef4':

Change-Id: I4c8ed47e3a5ca4dba3e423332bc6252e9ec92e43
 2016-05-19 23:34:16 +00:00
Matt Sarett b898481de7 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 am: 75dea9ca3a 
am: 8a55c65345

* commit '8a55c653458c2d33af506b193e658faf8f88bfa3':
  DO NOT MERGE Use updated libpng API

Change-Id: Id8a3a6a56edc5fbc9a10e08d9c09f47850964612
 2016-05-19 23:31:23 +00:00
Matt Sarett 8a55c65345 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 
am: 75dea9ca3a

* commit '75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1':
  DO NOT MERGE Use updated libpng API

Change-Id: Id23a9528e6413e40cd3249e0143c02798dcec4cc
 2016-05-19 23:28:21 +00:00
Matt Sarett bd43d7e92b resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392 
am: 75dea9ca3a

* commit '75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1':
  DO NOT MERGE Use updated libpng API

Change-Id: I75e0414350115ec133d9905263c01c3b385512b3
 2016-05-19 23:28:20 +00:00
Matt Sarett 75dea9ca3a resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 
am: b02b2fe392

* commit 'b02b2fe392827a423c7783522edc5b9ad3d4f130':
  DO NOT MERGE Use updated libpng API

Change-Id: Ie6e8c5118687f0d34fc4acffdcb1d784e71e411f
 2016-05-19 23:25:43 +00:00
Matt Sarett b02b2fe392 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d 
am: fc1d9a49d1

* commit 'fc1d9a49d1e33c133c96cf6b04d6f47d3cfaa496':
  DO NOT MERGE Use updated libpng API

Change-Id: Id9da4d3980f394bf19032581629d0baf9c30e0fc
 2016-05-19 23:22:55 +00:00
Matt Sarett fc1d9a49d1 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 
am: 300af0779d

* commit '300af0779de3c2658f32e3de40adc41dae92df1e':
  DO NOT MERGE Use updated libpng API

Change-Id: Iac60caa51e747fcde2c08ddf06323e8b1e98f36a
 2016-05-19 23:20:22 +00:00