68fe0be25e
Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d
...
am: e13a690c16
2016-06-01 21:57:06 +00:00
e13a690c16
Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6
...
am: a7fca9402d
2016-06-01 21:50:49 +00:00
a7fca9402d
Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.""
...
am: c96c9881a6
2016-06-01 21:44:07 +00:00
c96c9881a6
Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector.""
2016-06-01 21:32:15 +00:00
a0c4011028
Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."
...
This reverts commit 50a6f8c833
2016-06-01 13:15:44 -07:00
150c500641
Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5 am: 11c794b1a7
...
am: 23bb1d210d
2016-06-01 19:12:43 +00:00
23bb1d210d
Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." am: a8850710e5
...
am: 11c794b1a7
2016-06-01 19:03:06 +00:00
11c794b1a7
Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."
...
am: a8850710e5
2016-06-01 18:48:55 +00:00
a8850710e5
Merge "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."
2016-06-01 18:24:15 +00:00
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
50b793e139
Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb am: fd49adbdaf
...
am: d8a518d711
2016-06-01 00:23:16 +00:00
d8a518d711
Merge "Revert "imgdiff: Generate statically linked imgdiff."" am: 59203510eb
...
am: fd49adbdaf
2016-06-01 00:19:34 +00:00
fd49adbdaf
Merge "Revert "imgdiff: Generate statically linked imgdiff.""
...
am: 59203510eb
2016-06-01 00:16:24 +00:00
59203510eb
Merge "Revert "imgdiff: Generate statically linked imgdiff.""
2016-06-01 00:09:19 +00:00
16e3861c84
Revert "imgdiff: Generate statically linked imgdiff."
...
This reverts commit b4422bd769
2016-06-01 00:08:40 +00:00
197e4afea4
Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc am: a83b798c57
...
am: f90090d429
2016-05-31 22:57:04 +00:00
f90090d429
Merge "imgdiff: Generate statically linked imgdiff." am: 680d783ecc
...
am: a83b798c57
2016-05-31 22:54:09 +00:00
a83b798c57
Merge "imgdiff: Generate statically linked imgdiff."
...
am: 680d783ecc
2016-05-31 22:51:16 +00:00
680d783ecc
Merge "imgdiff: Generate statically linked imgdiff."
2016-05-31 22:42:13 +00:00
b4422bd769
imgdiff: Generate statically linked imgdiff.
...
Bug: 28941046
Change-Id: If3019d8cff91fd4f6fa4516bef5a0f51c2ddebc7
2016-05-30 21:53:11 -07:00
994bacf549
Disable the meaningless parts of the UI for A/B.
...
am: 01fcbe160b
2016-05-24 17:12:58 +00:00
f51e507fa7
resolve merge conflicts of 50f6417
...
am: 3f6eb8639050f6417
2016-05-24 01:17:02 +00:00
1afd591a09
Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11
...
am: f5e2831bf3
2016-05-24 01:17:01 +00:00
79c13cee26
resolve merge conflicts of 84478e8 to nyc-mr1-dev-plus-aosp
...
Change-Id: I84ed9e14d3103e5497a6d57fde0abafe9265a148
2016-05-23 18:13:58 -07:00
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
3f6eb86390
resolve merge conflicts of 50f6417
...
Fix a typo for ota_fclose().
Change-Id: Ia93e911aa5391afc604874fc3a09c5a45c094c80
2016-05-23 14:58:53 -07:00
f5e2831bf3
Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c
...
am: 1ae2434c11
2016-05-23 21:22:07 +00:00
1ae2434c11
Merge "slot_metadata: add verity_corrupted field"
...
am: 3788001b2c
2016-05-23 21:18:55 +00:00
3788001b2c
Merge "slot_metadata: add verity_corrupted field"
2016-05-23 21:10:16 +00:00
549745cc87
resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp
...
Change-Id: I834aba65cb29102055ff9e70969973a7870d0e60
2016-05-23 12:30:42 -07:00
84478e8823
resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp
...
Change-Id: I42c127f7946e678acf6596f6352f090abc0ca019
2016-05-23 12:24:28 -07:00
3aabd770d9
Merge "Allow recovery to return error codes" into nyc-dev
...
am: 50f6417317
2016-05-23 18:15:40 +00:00
50f6417317
Merge "Allow recovery to return error codes" into nyc-dev
2016-05-23 18:03:41 +00:00
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
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
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
2016-05-19 23:34:16 +00:00
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
2016-05-19 23:31:23 +00:00
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
2016-05-19 23:28:21 +00:00
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
2016-05-19 23:28:20 +00:00
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
2016-05-19 23:25:43 +00:00
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
2016-05-19 23:22:55 +00:00
fc1d9a49d1
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55
...
am: 300af0779d
2016-05-19 23:20:22 +00:00
300af0779d
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad
...
am: aa02888e55
2016-05-19 23:17:52 +00:00
aa02888e55
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27
...
am: 8a1d4e97ad
2016-05-19 23:14:39 +00:00
8a1d4e97ad
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630
...
am: ca45737e27
2016-05-19 23:12:10 +00:00
ca45737e27
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e
...
am: 1f814d7630
2016-05-19 23:08:54 +00:00
1f814d7630
resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f
...
am: 36acff7d7e
2016-05-19 23:06:06 +00:00
36acff7d7e
resolve merge conflicts of 86a28d0 to klp-modular-dev
...
am: a5bc59620f
2016-05-19 23:03:35 +00:00
a5bc59620f
resolve merge conflicts of 86a28d0 to klp-modular-dev
...
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
2016-05-19 15:47:25 -04:00
86a28d0aaf
DO NOT MERGE Use updated libpng API
...
am: 839b4e592a
2016-05-19 19:26:12 +00:00
Tao Bao
Adam Buchbinder
Treehugger Robot
Elliott Hughes
Tianjie Xu
Jeremy Compostella
Matt Sarett