Commit Graph

2874 Commits

Author SHA1 Message Date
Damien Bargiacchi 5afbbdd27a Merge "Support use of custom fonts in miniui" into cw-f-dev am: 929ffefdcc
am: bdaee896a6

Change-Id: I723bcfb54cfc80d3b34707eff174f495e2374532
2016-08-24 21:06:36 +00:00
Damien Bargiacchi aa7474aca4 Support use of custom fonts in miniui am: 35fff61b1c
am: e3c7184911

Change-Id: I92105784e928d69154d184aa9a514660405cc90f
2016-08-24 21:06:35 +00: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 9c30c29e70 resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp
am: 9de20d4a7c

Change-Id: Ib79151c746f36a056a8236fedf5afb1cdc0dfcce
2016-08-18 06:40:44 +00: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 b580027c15 "view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc am: a44d4355ba
am: cc34bf13ef

Change-Id: Ic0243ec1db8713cf796b9a37f45a2ef1e5b5010a
2016-08-17 23:56:30 +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 8b3336b2e6 Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 am: e254b4e9e4
am: d93f541679

Change-Id: I4832afe30fb536bcb8cc043c5c04a2f521ac1136
2016-08-17 22:17:12 +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 bebe94b105 Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d am: d7865e81f1
am: 63e4cc1d16

Change-Id: Ib6533e78255613f4b608aa976cd3221a998b0644
2016-08-15 18:16:06 +00: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 de36f5ed6b Add inttypes.h for PRIu64. am: 53c107f068 am: 0d345b6731
am: 30f1ad1169

Change-Id: Ia3ea7a02b91cb7d99340886639f496a22c50886f
2016-08-12 22:50:46 +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 35df4f7ced Merge "Add inttypes.h for PRIu64." into nyc-mr1-dev-plus-aosp
am: 567a7326c2

Change-Id: Ie3987944e259dea1d9a154fe7412fc81d382d158
2016-08-12 21:54:24 +00:00
Alex Deymo 25c2f02cb5 Add inttypes.h for PRIu64.
am: 4e29ce0b88

Change-Id: I48a4b0aba107f81fd5ea59b76c7fc658df30c3b0
2016-08-12 21:54:23 +00:00
Josh Gao 92c7e27e95 Merge "adb headers now refer to openssl headers." am: e4cf854dbf am: c687a72d9f am: d7067c7fea
am: 01e9b56154

Change-Id: Ibb976fc8846afc9b39ef7bb5e5a535f8581aa28d
2016-08-12 21:39:26 +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 606724d7ad resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp
am: 9eaffca358

Change-Id: I10332a4634111b6a3cd39ef65e9b0d9392f95d64
2016-08-12 19:23:47 +00: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 462324b655 Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 am: b33a6f8342
am: d38ddde181

Change-Id: I8f21fc8895f5bc2bb714ce64aad137052e825464
2016-08-09 20:07:26 +00: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