Commit Graph

2505 Commits

Author SHA1 Message Date
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 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 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 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
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
Josh Gao e4cf854dbf Merge "adb headers now refer to openssl headers." 2016-08-12 21:11:26 +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
Elliott Hughes 1675848a39 adb headers now refer to openssl headers.
Change-Id: Icddc4a4f226595338fafbcb14ee9338c58b4a80f
2016-08-09 18:46:57 -07: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 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 1e324fa459 Merge "Recovery mode UI flicker" am: 629bde8c6c
am: a5734c2ad8

Change-Id: I11e00d7502d32db5567a6fa99106d8983c048c24
2016-08-08 18:04:09 +00:00
xinglong.zhu a5734c2ad8 Merge "Recovery mode UI flicker"
am: 629bde8c6c

Change-Id: I2d9c2a88e8df9d5a096aa70a4a420754c668de26
2016-08-08 18:01:42 +00:00
Treehugger Robot 629bde8c6c Merge "Recovery mode UI flicker" 2016-08-08 17:55:15 +00:00
Johan Harvyl 8569142147 Handle error from fopen_path in finish_recovery
The fopen_path will fail here e.g. if /cache is corrupt and could
not be mounted. Not properly handling an error code from
fopen_path() results in a boot loop into recovery as fwrite() on
a NULL FILE object will crash the recovery app.

Change-Id: I1ccff5a8cb620a32f32adfe97a3fae8e5e908f39
2016-08-08 08:28:30 +02:00
Josh Gao 073164f24b Fix references to libcrypto_utils_static.
Bug: http://b/30708454
Change-Id: I7a5048beff1d8b783a9683dcb4a79606a77f20ee
2016-08-05 18:08:03 -07:00
xinglong.zhu c4fa2c2c40 Recovery mode UI flicker
[root cause  ] miniui has no mechanism to protect
               the buffer which is displaying
[changes     ] recovery
[side effects] ui show
[self test   ] sc9850-2 general operation has not display abnormal
[reviewers   ] xinglong.zhu

Signed-off-by: xinglong.zhu <xinglong.zhu@spreadtrum.com>
[change_type ] AOB --> google_original
[tag_product ] common

Change-Id: I989a0b2943ff6070a0e98718cfbe95144510d3a2
2016-08-05 22:30:14 +00:00
Tianjie Xu 5a84cecd26 Merge "Further compress the text images with zopflipng" am: 61240f88ea
am: 3e244dc301

Change-Id: Id651a94190d91c508b55d3745816253160b84284
2016-08-03 18:01:35 +00:00
Tianjie Xu 3e244dc301 Merge "Further compress the text images with zopflipng"
am: 61240f88ea

Change-Id: Ib3b28e84ee331a0e9d613d3761ff4d657c23088d
2016-08-03 17:59:11 +00:00
Tianjie Xu 61240f88ea Merge "Further compress the text images with zopflipng" 2016-08-03 17:52:18 +00:00
Tianjie Xu 1123fafd01 Further compress the text images with zopflipng
Bug:30415666
Test: Graphic tests pass on angler with new image files
Change-Id: I8716f53cb2f9fc6598fdc84f84e9626994faaa5e
2016-08-03 10:17:11 -07:00
Tao Bao 73d3acf50e Merge \\"Clean up verifier testcases.\\" am: e91aef0ee9
am: 717b49254b

Change-Id: Ib72cddc0c9d3a916566fb77d0611aa153f3a6ead
2016-08-01 19:50:34 +00:00
Tao Bao 717b49254b Merge \"Clean up verifier testcases.\"
am: e91aef0ee9

Change-Id: Ia130dc2a7f62ecf1ad40ec03d88a331a31800efa
2016-08-01 19:48:08 +00:00
Treehugger Robot e91aef0ee9 Merge "Clean up verifier testcases." 2016-08-01 19:42:35 +00:00
Tao Bao 5af4b1901d Clean up verifier testcases.
A Certificate is a pair of an RSAPublicKey and a particular hash. So v1
and v3 differ in the hash algorithm (SHA-1 vs SHA-256), similarly for
v2 and v4.

In verifier testcases, we used to load v1/v2 keys with an explicit
argument of "sha256" to test the v3/v4 keys. This CL switches to loading
v3/v4 keys directly and lets load_keys() to handle that, which is the
actual flow we use in practice.

Also remove the "fallback to v1 key" in the testcases, which is not the
actual behavior.

Bug: 30415901
Test: Run the verifier_test component test on device.

Change-Id: I3a2baa64826f1b6c4c367a560090df384c4521bb
2016-08-01 11:32:28 -07:00
Tianjie Xu 698f75467a Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0
am: b02a58740e

Change-Id: Ib15f443946a97eeb6609b0aab9b91bcd3ca91d4c
2016-07-29 00:12:42 +00:00
Tianjie Xu b02a58740e Merge \"Add docs on regeneration background text image\"
am: 5aa2e104c0

Change-Id: I565fa63de18e0c806f2452c009d97c5ad4ebebc3
2016-07-29 00:09:45 +00:00
Tianjie Xu 5aa2e104c0 Merge "Add docs on regeneration background text image" 2016-07-28 23:52:44 +00:00
Tianjie Xu 9a259772cc Add docs on regeneration background text image
Also add a missing string in the recovery_l10n APP.

Bug: 30415666
Change-Id: Ice2a9f7cad4ebe332b427bc0c7a9adccb6cf3af3
2016-07-28 23:45:45 +00:00
Tianjie Xu a26823d96d Merge \\"Regenerate the background text with pngcrush\\" am: 7b6263960f
am: c6d607f6ba

Change-Id: Id840cc2ce8a3c50193a72f9083b0f5f65c497dec
2016-07-28 22:20:35 +00:00
Tianjie Xu c6d607f6ba Merge \"Regenerate the background text with pngcrush\"
am: 7b6263960f

Change-Id: I73cf37099340d2ea492f0a178813d36d751c8827
2016-07-28 22:17:36 +00:00
Tianjie Xu 7b6263960f Merge "Regenerate the background text with pngcrush" 2016-07-28 22:09:01 +00:00
Tianjie Xu 489c7780a8 Regenerate the background text with pngcrush
After process the text images with pngquant, I encountered a
image-loading error when doing graphic tests on angler. The command
"pngcrush -c 0 $imagename" resolves this error and gives almost the
same compression rate. So regenerate all the text images with "pngcrush
-c 0"

Bug: 30415666
Test: Run graphics test on angler and the background text looks good.
Change-Id: I5d989c1230e826407287265fc559349a7bd29303
2016-07-28 15:06:49 -07:00
Tianjie Xu 53c34ebdc4 Resolve merge conflicts of 286848e to stage-aosp-master
am: 9da825940d

Change-Id: Ibbb885ee643e909ff00cd302c62b112c645c68ca
2016-07-28 02:46:38 +00:00
Tianjie Xu 9da825940d Resolve merge conflicts of 286848e to stage-aosp-master
Change-Id: I3bfe781a215e09ebe162af8522972976c110410f
2016-07-27 19:39:43 -07:00
Tianjie Xu 286848e754 Merge "Update background text images under recovery" 2016-07-28 01:44:59 +00:00
Tianjie Xu b7394cdd34 Update background text images under recovery
Update the text images according to the new translations of
"b+sr+Latn", "be-rBY", and "bs-rBA". Also switch to pngquant
which gives a better compression rate.

Bug: 30415666
Change-Id: I6eae5dd7be4c7f1f93c50113822caac9868e0f95
2016-07-28 01:41:55 +00:00
Chih-hung Hsieh fc7cbe465f Merge \\"Fix clang-tidy performance warnings.\\" am: 2a3b695168
am: 977903da49

Change-Id: Id3e48c6cf66c6f81ead25dd468bb109ce260f377
2016-07-27 20:53:01 +00:00
Chih-Hung Hsieh 977903da49 Merge \"Fix clang-tidy performance warnings.\"
am: 2a3b695168

Change-Id: I55cadf517ec612f1b03de71ce7ca5cff69bc80d0
2016-07-27 20:49:34 +00:00