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

2679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes 26474639b9 resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f am: eaddde6888 
am: b36980cc09

Change-Id: I1ebaa7e62c774f08a07360df7d8498872aaf4e9d
 2016-06-15 22:50:01 +00:00
Elliott Hughes b36980cc09 resolve merge conflicts of 179c0d8 to stage-aosp-master am: 274d17dc0f 
am: eaddde6888

Change-Id: I10d484d02389fa30cc8d8398bcf5b276de31432e
 2016-06-15 22:33:02 +00:00
Elliott Hughes eaddde6888 resolve merge conflicts of 179c0d8 to stage-aosp-master 
am: 274d17dc0f

Change-Id: I356adf332d5749a6d3f3e29b99bf3fca35de349a
 2016-06-15 22:28:05 +00:00
Elliott Hughes 274d17dc0f resolve merge conflicts of 179c0d8 to stage-aosp-master 
Change-Id: Iba5aec266444cabf83f600f2bdb45a3c027e5995
 2016-06-15 15:22:17 -07:00
Elliott Hughes 179c0d80bc Merge "Remove obsolete MTD support." 2016-06-15 21:55:15 +00:00
Tao Bao 5f040c325f Merge \\\\"Add bootloader_message_ab struct.\\\\" am: 59f04b9982 am: f57d7f02c9 am: 2fc7cd69fd 
am: ef9718483b

Change-Id: Ie39b3347eae4710993f210e01aded2098b09b0f7
 2016-06-14 16:32:20 +00:00
Tao Bao ef9718483b Merge \\\"Add bootloader_message_ab struct.\\\" am: 59f04b9982 am: f57d7f02c9 
am: 2fc7cd69fd

Change-Id: If4dce87bc57f0a305538507844c96084bec45d0c
 2016-06-14 16:27:34 +00:00
Tao Bao 2fc7cd69fd Merge \\"Add bootloader_message_ab struct.\\" am: 59f04b9982 
am: f57d7f02c9

Change-Id: Ie2407db5b16f90cbd07ada2d96441aba4055e6c9
 2016-06-14 16:22:55 +00:00
Tao Bao f57d7f02c9 Merge \"Add bootloader_message_ab struct.\" 
am: 59f04b9982

Change-Id: I9c3a816243a03dc2723679ef6efa241361446b96
 2016-06-14 16:18:22 +00:00
Tao Bao 59f04b9982 Merge "Add bootloader_message_ab struct." 2016-06-14 16:09:16 +00:00
Tao Bao 8327fb1861 resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp am: 38afad46d8 
am: 21793c32be

Change-Id: I0656e3b6863fad36654b030b9bbdf05724969a29
 2016-06-14 02:25:32 +00:00
Tao Bao 968a3d72a4 resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp 
am: ff38526b22

Change-Id: I1f1edea0e6bfae1540e84867a4401fdeb543b879
 2016-06-14 02:25:31 +00:00
Tao Bao 21793c32be resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp 
am: 38afad46d8

Change-Id: I597370534ef1bd4d65fea9e6054a499f88b282e9
 2016-06-14 02:20:26 +00:00
Tao Bao ff38526b22 resolve merge conflicts of 2a4386f to nyc-mr1-dev-plus-aosp 
Change-Id: I70eef6efaba6990fdae2b58b3bbca03407b6676e
 2016-06-13 19:17:07 -07:00
Tao Bao 38afad46d8 resolve merge conflicts of 490fad6 to nyc-dev-plus-aosp 
Change-Id: I299fe15977c1a59d0c784728872c3a7f63c95e56
 2016-06-13 19:12:46 -07:00
Tao Bao 2a4386fa7b applypatch: Don\'t call inflate() when it expects zero-length output. 
am: 490fad6791

Change-Id: Id4df6fd73edf70ce88d3df4a5ebaeb665f38eef3
 2016-06-14 01:29:09 +00:00
Tao Bao 490fad6791 applypatch: Don't call inflate() when it expects zero-length output. 
We may have expanded_len == 0 when calling inflate(). After switching to
using std::vector, it passes a nullptr buffer to inflate() and leads to
Z_STREAM_ERROR.

Bug: 29312140
Change-Id: Iab7c6c07a9e8488e844e7cdda76d02bd60d2ea98
 2016-06-13 16:42:52 -07:00
Tao Bao 70ff92894e Merge \\"recovery: Track the name change for wipe_ab.\\" into nyc-mr1-dev am: dc1393d09b 
am: 0146b37256

Change-Id: Idfea28dc1824394b60ea5c9ddb8ee77834c2d86a
 2016-06-13 16:54:14 +00:00
Tao Bao 0146b37256 Merge \"recovery: Track the name change for wipe_ab.\" into nyc-mr1-dev 
am: dc1393d09b

Change-Id: I7ec8d93bb41d0bd7f921fbb97c5b8639798e3bec
 2016-06-13 16:50:43 +00:00
Tao Bao dc1393d09b Merge "recovery: Track the name change for wipe_ab." into nyc-mr1-dev 2016-06-13 16:43:46 +00:00
Tao Bao 2a069a9dfd Merge \\\\"updater: Fix the broken ReadFileFn.\\\\" am: 4ddd5edf31 am: 89dfe730d4 am: 1e67422f37 
am: d241c85cd0

Change-Id: Id5d0de845b101668ff30d19cc257d78e0575e58d
 2016-06-11 19:00:54 +00:00
Tao Bao d241c85cd0 Merge \\\"updater: Fix the broken ReadFileFn.\\\" am: 4ddd5edf31 am: 89dfe730d4 
am: 1e67422f37

Change-Id: I3beade52bfaeea0e84055d007d82ff2ef5c07dbb
 2016-06-11 18:57:05 +00:00
Tao Bao 1e67422f37 Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31 
am: 89dfe730d4

Change-Id: Ia465c92d341da4681d3490151a20e1e117271e52
 2016-06-11 18:53:14 +00:00
Tao Bao 89dfe730d4 Merge \"updater: Fix the broken ReadFileFn.\" 
am: 4ddd5edf31

Change-Id: Id73ccb86a3869198baf84b7978054b174c281c79
 2016-06-11 18:49:21 +00:00
Tao Bao 4ddd5edf31 Merge "updater: Fix the broken ReadFileFn." 2016-06-11 18:42:53 +00:00
Tao Bao efacd80364 updater: Fix the broken ReadFileFn. 
Was accidentally broken by the CL in [1].

[1]: commit d6c93afcc2

Change-Id: I851e13ccea6f5be6fcd47f712cc95867245f9934
 2016-06-11 03:59:56 -07:00
Elliott Hughes 63a319201f Remove obsolete MTD support. 
Bug: http://b/29250988
Change-Id: Ia97ba9082a165c37f74d6e1c3f71a367adc59945
 2016-06-10 13:45:35 -07:00
Tianjie Xu 4bc65fdac4 Log source/target build version to last_install am: b0ddae55e5 am: dcf1089771 
am: d8f519607c

Change-Id: I1be3af313d27eb87b7c1864ba6e657b196a8c04b
 2016-06-10 17:32:59 +00:00
Tianjie Xu d8f519607c Log source/target build version to last_install am: b0ddae55e5 
am: dcf1089771

Change-Id: Iec992f05f0721b4509d996bbacdbcb7cdd397e5c
 2016-06-10 17:31:09 +00:00
Tianjie Xu 1d8ac5f090 Log source/target build version to last_install am: b0ddae55e5 am: 9d2657fbb7 
am: 32027d8438

Change-Id: I8691365a80aaa9cf2c138dcaae005970dba44a1b
 2016-06-10 17:27:38 +00:00
Tianjie Xu 32027d8438 Log source/target build version to last_install am: b0ddae55e5 
am: 9d2657fbb7

Change-Id: I3bb89e59b0e21d415fa1b5681f08803ffd787169
 2016-06-10 17:24:50 +00:00
Tianjie Xu dcf1089771 Log source/target build version to last_install 
am: b0ddae55e5

Change-Id: I8be36165769d4159e4578f9fea54f332e4e77c6c
 2016-06-10 17:21:40 +00:00
Tianjie Xu 9d2657fbb7 Log source/target build version to last_install 
am: b0ddae55e5

Change-Id: Ifd9e006588de8bea233a4e90a5c80ed6b894054a
 2016-06-10 17:21:40 +00:00
Tao Bao 108ab21b21 recovery: Track the name change for wipe_ab. 
Bug: 27253717
Change-Id: I6e63b2a80b7b2948c16e1b57dedc856d52456ac9
 2016-06-10 10:13:32 -07:00
Elliott Hughes 40d856b89e Merge \\\\"Remove etc/META-INF/com/google/android/update-script.\\\\" am: 5b2191a9d6 am: 5be6ae12b5 am: 21c4f4e6e6 
am: fc29db992a

Change-Id: I9e530f8a40c600fe00c2bff26dbe99c5d07bb195
 2016-06-10 16:36:01 +00:00
Elliott Hughes fc29db992a Merge \\\"Remove etc/META-INF/com/google/android/update-script.\\\" am: 5b2191a9d6 am: 5be6ae12b5 
am: 21c4f4e6e6

Change-Id: I62527d8d5217384c1524090da3428fea31d03615
 2016-06-10 16:33:17 +00:00
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
Tao Bao 9fb2b592e2 Add bootloader_message_ab struct. 
Move A/B-specific fields, effectively slot_suffix as in this CL, out of
bootloader_message struct. Those A/B-specific fields are expected to be
managed by the A/B-bootloader or boot control HAL, which shouldn't be
cleared by recovery or uncrypt.

Round up the bootloader_message struct to 2-KiB. Round up the
bootloader_message_ab struct to 4-KiB.

Bug: 29193360
Change-Id: I5740a612456da6d4d3b00e49a202d8f689d32690
 2016-06-09 21:46:13 -07: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
Tianjie Xu b0ddae55e5 Log source/target build version to last_install 
Parse the build.version.incremental from the metadata of the update
package; and log it to last_install.
Example:
In metadata we read:
post-build-incremental=2951741
pre-build-incremental=2943039

In last install we log:
source_build: 2943039
target_build: 2951741

Bug: 28658632
Change-Id: I0a9cc2d01644846e18bda31f4193ff40e8924486
 2016-06-09 17:29:04 -07:00
Alain Vongsouvanh 41840b6e0c Merge \"resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3\" into nyc-mr1-dev-plus-aosp 
am: ab380fd77d

Change-Id: I7c96593906f26e71eae8760e3f474ac2e8115f38
 2016-06-08 15:56:46 +00:00
Alain Vongsouvanh ae3269accd resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 2a697feb39 
am: 61da13a57f

Change-Id: I38702eb8b5e7a8455cc2a531e5c0fffaa4d955cc
 2016-06-08 15:56:46 +00:00
Android Build Merger (Role) ab380fd77d Merge "resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 91d78acbd3" into nyc-mr1-dev-plus-aosp 2016-06-08 15:52:05 +00:00
Alain Vongsouvanh 61da13a57f resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 
am: 2a697feb39

Change-Id: Id1dcd42164121b4c31089c47fb56fb317da19896
 2016-06-08 15:51:48 +00:00
Alain Vongsouvanh aec20552a4 resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 
am: 91d78acbd3

Change-Id: Ib2c1caa0a5f43d708634aaa69b8b1a9fc094edeb
 2016-06-08 15:51:48 +00:00
Alain Vongsouvanh 91d78acbd3 resolve merge conflicts of 6aa6ddb to nyc-dev 
am: 771b6eb8d9

Change-Id: Icc7290bbdf7b7420bab34b56f4e368f93b007053
 2016-06-08 15:46:40 +00: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