606724d7ad
resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp
...
am: 9eaffca358
2016-08-12 19:23:47 +00:00
9eaffca358
resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp
...
Change-Id: Icd879395a88ff1de0fcf0c754c0633d8fb6cf208
2016-08-12 11:21:43 -07:00
66940b9f33
Call update_engine_sideload from recovery.
...
am: 4344d636d4
2016-08-12 18:06:56 +00:00
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
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
1675848a39
adb headers now refer to openssl headers.
...
Change-Id: Icddc4a4f226595338fafbcb14ee9338c58b4a80f
2016-08-09 18:46:57 -07:00
462324b655
Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7 am: b33a6f8342
...
am: d38ddde181
2016-08-09 20:07:26 +00:00
d38ddde181
Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7
...
am: b33a6f8342
2016-08-09 20:04:17 +00:00
b33a6f8342
Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9
...
am: a550ee0df7
2016-08-09 19:55:43 +00:00
a550ee0df7
Merge "Handle error from fopen_path in finish_recovery"
...
am: 8a4333f3b9
2016-08-09 19:50:15 +00:00
8a4333f3b9
Merge "Handle error from fopen_path in finish_recovery"
2016-08-09 19:23:16 +00:00
2d7ff437ae
Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346 am: e6a4195bf7
...
am: 66571856a1
2016-08-08 18:41:47 +00:00
66571856a1
Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0 am: dc97404346
...
am: e6a4195bf7
2016-08-08 18:39:20 +00:00
e6a4195bf7
Merge "Fix references to libcrypto_utils_static." am: b97da5e0f0
...
am: dc97404346
2016-08-08 18:36:16 +00:00
dc97404346
Merge "Fix references to libcrypto_utils_static."
...
am: b97da5e0f0
2016-08-08 18:33:51 +00:00
b97da5e0f0
Merge "Fix references to libcrypto_utils_static."
2016-08-08 18:29:10 +00:00
397bf4ef93
Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8 am: 1e324fa459
...
am: 4c4323254e
2016-08-08 18:13:09 +00:00
4c4323254e
Merge "Recovery mode UI flicker" am: 629bde8c6c am: a5734c2ad8
...
am: 1e324fa459
2016-08-08 18:07:39 +00:00
1e324fa459
Merge "Recovery mode UI flicker" am: 629bde8c6c
...
am: a5734c2ad8
2016-08-08 18:04:09 +00:00
a5734c2ad8
Merge "Recovery mode UI flicker"
...
am: 629bde8c6c
2016-08-08 18:01:42 +00:00
629bde8c6c
Merge "Recovery mode UI flicker"
2016-08-08 17:55:15 +00:00
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
073164f24b
Fix references to libcrypto_utils_static.
...
Bug: http://b/30708454
Change-Id: I7a5048beff1d8b783a9683dcb4a79606a77f20ee
2016-08-05 18:08:03 -07:00
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
a5dd2a452c
Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301 am: 5a84cecd26
...
am: 8b36965175
2016-08-03 18:11:54 +00:00
8b36965175
Merge "Further compress the text images with zopflipng" am: 61240f88ea am: 3e244dc301
...
am: 5a84cecd26
2016-08-03 18:04:05 +00:00
5a84cecd26
Merge "Further compress the text images with zopflipng" am: 61240f88ea
...
am: 3e244dc301
2016-08-03 18:01:35 +00:00
3e244dc301
Merge "Further compress the text images with zopflipng"
...
am: 61240f88ea
2016-08-03 17:59:11 +00:00
61240f88ea
Merge "Further compress the text images with zopflipng"
2016-08-03 17:52:18 +00:00
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
9ee8133b53
Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b am: 73d3acf50e
...
am: 91f87bb647
2016-08-01 21:50:44 +00:00
91f87bb647
Merge \\\"Clean up verifier testcases.\\\" am: e91aef0ee9 am: 717b49254b
...
am: 73d3acf50e
2016-08-01 19:53:34 +00:00
73d3acf50e
Merge \\"Clean up verifier testcases.\\" am: e91aef0ee9
...
am: 717b49254b
2016-08-01 19:50:34 +00:00
717b49254b
Merge \"Clean up verifier testcases.\"
...
am: e91aef0ee9
2016-08-01 19:48:08 +00:00
e91aef0ee9
Merge "Clean up verifier testcases."
2016-08-01 19:42:35 +00:00
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
f136e71f7a
Merge \\\\"Add docs on regeneration background text image\\\\" am: 5aa2e104c0 am: b02a58740e am: 698f75467a
...
am: 0df6011d0f
2016-07-29 00:27:34 +00:00
0df6011d0f
Merge \\\"Add docs on regeneration background text image\\\" am: 5aa2e104c0 am: b02a58740e
...
am: 698f75467a
2016-07-29 00:15:44 +00:00
698f75467a
Merge \\"Add docs on regeneration background text image\\" am: 5aa2e104c0
...
am: b02a58740e
2016-07-29 00:12:42 +00:00
b02a58740e
Merge \"Add docs on regeneration background text image\"
...
am: 5aa2e104c0
2016-07-29 00:09:45 +00:00
5aa2e104c0
Merge "Add docs on regeneration background text image"
2016-07-28 23:52:44 +00:00
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
529a369072
Merge \\\\"Regenerate the background text with pngcrush\\\\" am: 7b6263960f am: c6d607f6ba am: a26823d96d
...
am: 1cd2fda40b
2016-07-28 22:54:17 +00:00
1cd2fda40b
Merge \\\"Regenerate the background text with pngcrush\\\" am: 7b6263960f am: c6d607f6ba
...
am: a26823d96d
2016-07-28 22:23:35 +00:00
a26823d96d
Merge \\"Regenerate the background text with pngcrush\\" am: 7b6263960f
...
am: c6d607f6ba
2016-07-28 22:20:35 +00:00
c6d607f6ba
Merge \"Regenerate the background text with pngcrush\"
...
am: 7b6263960f
2016-07-28 22:17:36 +00:00
7b6263960f
Merge "Regenerate the background text with pngcrush"
2016-07-28 22:09:01 +00:00
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
bffbd487fc
Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d am: 53c34ebdc4
...
am: 03539f5e83
2016-07-28 02:56:50 +00:00
03539f5e83
Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d
...
am: 53c34ebdc4
2016-07-28 02:50:08 +00:00
Alex Deymo
Johan Harvyl
Elliott Hughes
Treehugger Robot
Josh Gao
xinglong.zhu
Tianjie Xu
Tao Bao