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

2405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes 21c4f4e6e6 Merge \\"Remove etc/META-INF/com/google/android/update-script.\\" am: 5b2191a9d6 
am: 5be6ae12b5

Change-Id: Ia2aace34275d4ef517b0bf47a8c9ae04f47a3f05
 2016-06-10 16:30:34 +00:00
Elliott Hughes 5be6ae12b5 Merge \"Remove etc/META-INF/com/google/android/update-script.\" 
am: 5b2191a9d6

Change-Id: Ie27f4c9d78de710eb45a87fed9c0aaf6b71404b6
 2016-06-10 16:27:49 +00:00
Elliott Hughes 5b2191a9d6 Merge "Remove etc/META-INF/com/google/android/update-script." 2016-06-10 16:20:42 +00:00
Elliott Hughes ad29b10c00 Remove etc/META-INF/com/google/android/update-script. 
Bug: http://b/29250988
Change-Id: I61f8c6717b38de2242e4ea8e0913237c1ce5bfea
 2016-06-09 18:03:05 -07:00
Alain Vongsouvanh 2a697feb39 resolve merge conflicts of 6aa6ddb to nyc-dev 
am: 771b6eb8d9

Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903
 2016-06-08 15:46:40 +00:00
Alain Vongsouvanh 771b6eb8d9 resolve merge conflicts of 6aa6ddb to nyc-dev 
Change-Id: I3696fe3e86e0222c7c26b0aa2bf1dd8e03ac5315
 2016-06-08 08:30:48 -07:00
Alain Vongsouvanh 6aa6ddb3c5 recovery: Make wear recovery more customizable. 
am: 5b00110e3d

Change-Id: I88ab75e875cea8813ab4bdc9f099c31609ace6fd
 2016-06-08 15:10:54 +00:00
Alain Vongsouvanh 5b00110e3d recovery: Make wear recovery more customizable. 
Making animation_fps protected and adding support for 0 frames intro.

BUG: 29085786
Change-Id: I07b44570022bad89661973178d453592c01f3f10
 2016-06-07 10:05:29 -07:00
Tianjie Xu 64f46fb16c resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp 
Change-Id: I2194d1170281f58eb508f2ef63b39c8729125f76
 2016-06-03 15:44:52 -07:00
Tao Bao ba33da2884 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp 
Change-Id: I18ecc333a76860405028b90b0baf2fba78d3942e
 2016-06-03 14:57:34 -07:00
Tao Bao fe8e356b7d Merge "recovery: Add support to brick a device." 
am: 0ab866b354

* commit '0ab866b3544ff999293b2c296908e969d72b5799':
  recovery: Add support to brick a device.

Change-Id: I4a106a6780b48f32d2776a436cc6445b3746fcc0
 2016-06-03 21:51:13 +00:00
Tao Bao 0ab866b354 Merge "recovery: Add support to brick a device." 2016-06-03 21:35:06 +00:00
Tianjie Xu 7ce287d432 Call ioctl before each write on retry 
If the update is a retry, ioctl(BLKDISCARD) the destination blocks before
writing to these blocks.

Bug: 28990135
Change-Id: I1e703808e68ebb1292cd66afd76be8fd6946ee59
 2016-06-03 12:12:50 -07:00
Tao Bao 862a4c1119 recovery: Add support to brick a device. 
When recovery starts with --brick, it tries to brick the device by
securely wiping all the partitions as listed in /etc/recovery.brick.

This is designed to support bricking lost devices.

Bug: 27253717
Change-Id: Ib0bd4f0a3bdaca4febc91fce6b682e3ec74354e2
 2016-06-03 11:01:41 -07:00
Tao Bao e13a690c16 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 
am: a7fca9402d

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

Change-Id: I4075fd84e12f48c2178ab21b78dc3efc7621a6c8
 2016-06-01 21:50:49 +00:00
Tao Bao a7fca9402d Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" 
am: c96c9881a6

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

Change-Id: Ie4f6b07f8526232b77e240fff37d73b3e35642cd
 2016-06-01 21:44:07 +00:00
Tao Bao c96c9881a6 Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" 2016-06-01 21:32:15 +00:00
Tao Bao a0c4011028 Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector." 
This reverts commit 50a6f8c833.

A mix of new and free leads to memory corruptions.
 2016-06-01 13:15:44 -07: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 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 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
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
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 84478e8823 resolve merge conflicts of 50f6417 to nyc-dev-plus-aosp 
Change-Id: I42c127f7946e678acf6596f6352f090abc0ca019
 2016-05-23 12:24:28 -07: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 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 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
Matt Sarett 300af0779d resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad 
am: aa02888e55

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

Change-Id: I10705dd579623e4b208093cfc4839aad496081c8
 2016-05-19 23:17:52 +00:00
Matt Sarett aa02888e55 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 
am: 8a1d4e97ad

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

Change-Id: I09e8917976c05beec8bf881140539948c323ce58
 2016-05-19 23:14:39 +00:00
Matt Sarett 8a1d4e97ad resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 
am: ca45737e27

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

Change-Id: Ia9c36583c9d60d01fec7ee9aefc973dabb1c07d3
 2016-05-19 23:12:10 +00:00
Matt Sarett ca45737e27 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e 
am: 1f814d7630

* commit '1f814d7630c56cc9e825ed411e068414c97acb6c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ib381e8ccefe9181911a2144d7255ecadefb42b5c
 2016-05-19 23:08:54 +00:00
Matt Sarett 1f814d7630 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f 
am: 36acff7d7e

* commit '36acff7d7e88549bbeab6a08488ab48596d7fbc5':
  DO NOT MERGE Use updated libpng API

Change-Id: I7f01d932235ef69640ed4859d0e62344b3b774de
 2016-05-19 23:06:06 +00:00
Matt Sarett 36acff7d7e resolve merge conflicts of 86a28d0 to klp-modular-dev 
am: a5bc59620f

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

Change-Id: I3d8d27b08fd1fd89c6b8d9c39b883a45aecb83ce
 2016-05-19 23:03:35 +00:00
Matt Sarett a5bc59620f resolve merge conflicts of 86a28d0 to klp-modular-dev 
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
 2016-05-19 15:47:25 -04:00
Matt Sarett 86a28d0aaf DO NOT MERGE Use updated libpng API 
am: 839b4e592a

* commit '839b4e592a7c81bdebe08fae4eef6e909c89acd6':
  DO NOT MERGE Use updated libpng API

Change-Id: I7bbece70a4129554d953fd22c71527b2ca11262e
 2016-05-19 19:26:12 +00:00