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

2509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 9d2657fbb7 Log source/target build version to last_install 
am: b0ddae55e5

Change-Id: Ifd9e006588de8bea233a4e90a5c80ed6b894054a
 2016-06-10 17:21:40 +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
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
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
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
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
Tao Bao df956eceef resolve merge conflicts of 1afa4d7 to nyc-mr1-dev-plus-aosp 
Change-Id: I8fca64ebdbafe27f02d359619aa60ab82618114a
 2016-06-03 21:26:19 -07:00
Tao Bao 1afa4d7b23 Merge "recovery: Add support to brick a device." into nyc-mr1-dev 2016-06-04 04:19:05 +00:00
Tianjie Xu 3295d1993a resolve merge conflicts of 7ce287d to nyc-dev-plus-aosp 
am: 64f46fb16c

* commit '64f46fb16ccae69f7a826585c5eaba48fe1b05da':

Change-Id: I2385636728c2d1f874d8c8b72f38237b2f8d5be9
 2016-06-03 23:29:25 +00:00
Tianjie Xu 894176632c resolve merge conflicts of 57ad046 to nyc-mr1-dev-plus-aosp 
Change-Id: I98502950a0882050f5ed1acb0549b218b2cd06e4
 2016-06-03 16:01:28 -07:00
Tao Bao 8dc1909901 resolve merge conflicts of fe8e356 to nyc-dev-plus-aosp 
am: ba33da2884

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

Change-Id: I44c667f8eb0d003a9cc84ea457f91b44263af7df
 2016-06-03 22:55:14 +00: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
Tianjie Xu 57ad046d9d Call ioctl before each write on retry 
am: 7ce287d432

* commit '7ce287d432dd3a4dc8841fc59e11ee1a0b7808a1':
  Call ioctl before each write on retry

Change-Id: Iae05ceca190c253d0be3ae9e4054abf4d0dbe751
 2016-06-03 22:38:11 +00: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 b083818612 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
(cherry picked from commit 862a4c1119)
 2016-06-03 14:43:05 -07: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 68fe0be25e Merge "Revert "Fix memory/resource handling in imgdiff.cpp, using unique_ptr and vector."" am: c96c9881a6 am: a7fca9402d 
am: e13a690c16

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

Change-Id: If1998189bb093906b97e41d3e2f4e10f89f92540
 2016-06-01 21:57:06 +00: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 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 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