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

2681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-Hung Hsieh a50d7faff0 Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 
am: d987fe1d57

Change-Id: Idd53009ad61bb4a0b573febdbedc5dc0eee8265f
 2016-08-26 23:47:34 +00:00
Chih-Hung Hsieh d987fe1d57 Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 
am: 9968866e86

Change-Id: Id888e91546d18d5ed0054e1fbac2823a6e31c6a1
 2016-08-26 23:44:33 +00:00
Chih-Hung Hsieh 9968866e86 Merge "Fix clang-tidy warnings in bootable/recovery." 
am: 89bf2bdc85

Change-Id: I7748981badcbcdfe24d0cbe1c41007c67f611b14
 2016-08-26 23:42:05 +00:00
Treehugger Robot 89bf2bdc85 Merge "Fix clang-tidy warnings in bootable/recovery." 2016-08-26 23:29:23 +00:00
Chih-Hung Hsieh 8b23811d2a Fix clang-tidy warnings in bootable/recovery. 
* Use const reference type for read-only parameters.
Bug: 30407689
* Use faster overloaded string find function.
Bug: 30411878
* Add parentheses around macro parameters.
Bug: 28705665

Test: build with WITH_TIDY=1
Change-Id: I4e8e5748bfa4ae89871f1fb5fa4624d372530d75
 2016-08-26 14:54:29 -07:00
Damien Bargiacchi bdaee896a6 Merge "Support use of custom fonts in miniui" into cw-f-dev 
am: 929ffefdcc

Change-Id: I5723771eb4d0716b120b7f682b47661a0ce48c67
 2016-08-24 20:45:21 +00:00
Damien Bargiacchi e3c7184911 Support use of custom fonts in miniui 
am: 35fff61b1c

Change-Id: Iac50e95c15c0b4337435d47d3666c2aaf5eb203d
 2016-08-24 20:45:14 +00:00
Damien Bargiacchi 929ffefdcc Merge "Support use of custom fonts in miniui" into cw-f-dev 2016-08-24 20:36:36 +00:00
Damien Bargiacchi 35fff61b1c Support use of custom fonts in miniui 
Bug: 29547343
Change-Id: I398160c85daac90ffab2fa9bb2e96795b9e9885a
 2016-08-18 19:51:45 -07:00
Tao Bao 9de20d4a7c resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp 
Change-Id: I56d8af5552758dae44c1030c684448e621d226c5
 2016-08-17 23:25:01 -07:00
Tao Bao 7f8dc846a3 Merge "Free mmaped area if keys fail to load" am: f599414aec 
am: b3ddc0a4bf

Change-Id: I204d7fedd2f950da41c3a481231c459fc32d0056
 2016-08-18 06:17:13 +00:00
Tao Bao b3ddc0a4bf Merge "Free mmaped area if keys fail to load" 
am: f599414aec

Change-Id: Id96153c211ca1fcc1cd78d6e662b0b48795c0d76
 2016-08-18 06:14:46 +00:00
Tao Bao f599414aec Merge "Free mmaped area if keys fail to load" 2016-08-18 06:10:35 +00:00
WiZarD edafac6c7b Free mmaped area if keys fail to load 
Keys for package verification is loaded after the update
package is mmaped into memory. This mmaped area needs
to be freed when exiting the function.

Another approach would be to mmap after loading the keys.

Change-Id: Ib77711a8acd5c363b5517da12dc311fb8f9f4605
Signed-off-by: WiZarD <WiZarD.Devel@gmail.com>
 2016-08-18 05:20:40 +00:00
Tianjie Xu cc34bf13ef "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc 
am: a44d4355ba

Change-Id: I0c3211372fb282da76fbcbcd6c56524fcfffa816
 2016-08-17 23:43:20 +00:00
Tianjie Xu a44d4355ba "view recovery logs" will show /tmp/recovery.log 
am: 62ab2a0fbc

Change-Id: I6acbbfd21b370df044413c4d15414b612b5654bb
 2016-08-17 23:40:48 +00:00
Tianjie Xu d93f541679 Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 
am: e254b4e9e4

Change-Id: Iedaed39a62f9756c0dc8122a40ea7db2c21f1c30
 2016-08-17 22:13:12 +00:00
Tianjie Xu e254b4e9e4 Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 
am: 4e4474c9c5

Change-Id: Iaca861be960a271c09c07deeaf4f98850edc4f71
 2016-08-17 22:10:12 +00:00
Tianjie Xu 62ab2a0fbc "view recovery logs" will show /tmp/recovery.log 
For A/B devices, "view recovery logs" doesn't work due to the lack
of cache partition. To help debugging, we'll show /tmp/recovery.log
instead if /cache is not found.

Change-Id: Idb77c3a4c30388148a210b38d732a7b27e757bba
Test: Tested on an A/B device and /tmp/recovery.log showed up.
Bug: 30905700
(cherry picked from commit a54f75ede8)
 2016-08-17 15:07:50 -07:00
Tianjie Xu 4e4474c9c5 Merge ""view recovery logs" will show /tmp/recovery.log" 
am: c158cf0a14

Change-Id: I1485c1c84a7caa20b11da4fd2561e0dba95fc39b
 2016-08-17 22:07:44 +00:00
Tianjie Xu c158cf0a14 Merge ""view recovery logs" will show /tmp/recovery.log" 2016-08-17 22:05:16 +00:00
Tianjie Xu a54f75ede8 "view recovery logs" will show /tmp/recovery.log 
For A/B devices, "view recovery logs" doesn't work due to the lack
of cache partition. To help debugging, we'll show /tmp/recovery.log
instead if /cache is not found.

Change-Id: Idb77c3a4c30388148a210b38d732a7b27e757bba
Test: Tested on an A/B device and /tmp/recovery.log showed up.
Bug: 30905700
 2016-08-17 12:35:22 -07:00
Johan Harvyl 63e4cc1d16 Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d 
am: d7865e81f1

Change-Id: I391ec86730d409d0d6c51e003d57f4f3f0a4a3e3
 2016-08-15 18:12:05 +00:00
Johan Harvyl d7865e81f1 Merge "Format formattable partitions if mount fails" am: cb76857147 
am: 2f5cfdbb9d

Change-Id: I7c0848776028caf766f33895a010349ccabf13bf
 2016-08-15 18:07:35 +00:00
Johan Harvyl 2f5cfdbb9d Merge "Format formattable partitions if mount fails" 
am: cb76857147

Change-Id: I50c2045f56693e445922d30af72867e7ac55b61f
 2016-08-15 18:03:37 +00:00
Treehugger Robot cb76857147 Merge "Format formattable partitions if mount fails" 2016-08-15 17:53:54 +00:00
Alex Deymo 30f1ad1169 Add inttypes.h for PRIu64. am: 53c107f068 
am: 0d345b6731

Change-Id: Idaa1aaeac69c91474500d093322ecf01ab6a49eb
 2016-08-12 22:19:39 +00:00
Alex Deymo 0d345b6731 Add inttypes.h for PRIu64. 
am: 53c107f068

Change-Id: I2c84d557d7ee32508eded49b2061bf80fecc35ae
 2016-08-12 22:11:47 +00:00
Alex Deymo 567a7326c2 Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp 2016-08-12 21:38:21 +00:00
Josh Gao 01e9b56154 Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f 
am: d7067c7fea

Change-Id: I40a1e90bcbab27caa4b2ddc117a201387620f988
 2016-08-12 21:28:49 +00:00
Josh Gao d7067c7fea Merge "adb headers now refer to openssl headers." am: e4cf854dbf 
am: c687a72d9f

Change-Id: I03330b8b93d9ac0262c2556018720689035b8d8f
 2016-08-12 21:25:18 +00:00
Josh Gao c687a72d9f Merge "adb headers now refer to openssl headers." 
am: e4cf854dbf

Change-Id: I8cb4f4fe840d45bf4ea09f864dee53130aee1144
 2016-08-12 21:21:53 +00:00
Alex Deymo 4e29ce0b88 Add inttypes.h for PRIu64. 
This missing header is needed to use PRIu64 macros.

Bug: 27178350
TEST=`mma bootable/recovery` on the failing branch.

Change-Id: I165701e8019256426d3f6a4168db52c6a0197c4d
 2016-08-12 21:20:45 +00:00
Josh Gao e4cf854dbf Merge "adb headers now refer to openssl headers." 2016-08-12 21:11:26 +00:00
Alex Deymo 53c107f068 Add inttypes.h for PRIu64. 
This missing header is needed to use PRIu64 macros.

Bug: 27178350
TEST=`mma bootable/recovery` on the failing branch.

Change-Id: I165701e8019256426d3f6a4168db52c6a0197c4d
 2016-08-12 13:46:17 -07:00
Alex Deymo 9eaffca358 resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp 
Change-Id: Icd879395a88ff1de0fcf0c754c0633d8fb6cf208
 2016-08-12 11:21:43 -07:00
Alex Deymo 66940b9f33 Call update_engine_sideload from recovery. 
am: 4344d636d4

Change-Id: Ic9586cb3176bf608d2044e37b89e570c71130dcc
 2016-08-12 18:06:56 +00:00
Johan Harvyl 29dd6b6c01 Format formattable partitions if mount fails 
If mount fails and the partition has the formattable flag set in fstab
it is formatted and another attempt at the mount is made.

Change-Id: I44edafac7d7ff663489072c66b7e210466316b14
 2016-08-12 16:13:50 +02:00
Alex Deymo 4344d636d4 Call update_engine_sideload from recovery. 
This patch enables sideloading an OTA on A/B devices while running from
recovery. Recovery accepts the same OTA package format as recent
versions of GMS, which consists of .zip file with the payload in it.

Bug: 27178350
TEST=`adb sideload` successfully a full OTA (*)
TEST=Failed to take several invalid payloads (wrong product,
fingerprint, update type, serial, etc).

<small>(*) with no postinstall script.</small>

Change-Id: I951869340100feb5a37e41fac0ee59c10095659e
 2016-08-11 18:55:11 -07:00
Elliott Hughes 1675848a39 adb headers now refer to openssl headers. 
Change-Id: Icddc4a4f226595338fafbcb14ee9338c58b4a80f
 2016-08-09 18:46:57 -07:00
Johan Harvyl d38ddde181 Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 
am: b33a6f8342

Change-Id: I24871e2d2259cb3444082ae89e4a59979ad5e197
 2016-08-09 20:04:17 +00:00
Johan Harvyl b33a6f8342 Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 
am: a550ee0df7

Change-Id: I291b2cdad02e2cd4b823b0d2c3e74c19f156bb67
 2016-08-09 19:55:43 +00:00
Johan Harvyl a550ee0df7 Merge "Handle error from fopen_path in finish_recovery" 
am: 8a4333f3b9

Change-Id: I9225bcbe1ed82a63f70c7c6a984fd043ac77100b
 2016-08-09 19:50:15 +00:00
Treehugger Robot 8a4333f3b9 Merge "Handle error from fopen_path in finish_recovery" 2016-08-09 19:23:16 +00:00
Josh Gao 66571856a1 Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 
am: e6a4195bf7

Change-Id: Ib497de2a8e38d60cf6be058de919bd8f5e5871cb
 2016-08-08 18:39:20 +00:00
Josh Gao e6a4195bf7 Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 
am: dc97404346

Change-Id: Ica1f4616c87c81e24b7e4b2dfa0778557dae4a6a
 2016-08-08 18:36:16 +00:00
Josh Gao dc97404346 Merge "Fix references to libcrypto_utils_static." 
am: b97da5e0f0

Change-Id: Ia935df84e5ea36dfc6605b41872c36db69a114a0
 2016-08-08 18:33:51 +00:00
Josh Gao b97da5e0f0 Merge "Fix references to libcrypto_utils_static." 2016-08-08 18:29:10 +00:00
xinglong.zhu 4c4323254e Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 
am: 1e324fa459

Change-Id: Idae46562d2b8d1db76f7b75fcef58b00fa6c3790
 2016-08-08 18:07:39 +00:00
xinglong.zhu 1e324fa459 Merge "Recovery mode UI flicker" am: 629bde8c6c 
am: a5734c2ad8

Change-Id: I11e00d7502d32db5567a6fa99106d8983c048c24
 2016-08-08 18:04:09 +00:00