Tao Bao
a0c3b1392e
Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37 am: 7f7d9b2f37
...
am: fbd7429ca3
Change-Id: I3533d4e2c9c242577e8cb05a3590649c3d2697de
2017-08-17 02:36:03 +00:00
Tao Bao
fbd7429ca3
Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e am: 228a2f2a37
...
am: 7f7d9b2f37
Change-Id: I460893bd4661d4338d482b3f66a2371458228acf
2017-08-17 00:53:39 +00:00
Tao Bao
7f7d9b2f37
Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd am: 151126360e
...
am: 228a2f2a37
Change-Id: I5c672cbf0171be019f7240135f9cf6d26e68de9f
2017-08-17 00:48:48 +00:00
Tao Bao
228a2f2a37
Merge "screen_ui: Fix a case that may truncate the last char." am: 2e99c38cfd
...
am: 151126360e
Change-Id: Id7117e58e1353ce3e9929908a4de0e8f6f8fe1d2
2017-08-17 00:44:08 +00:00
Tao Bao
151126360e
Merge "screen_ui: Fix a case that may truncate the last char."
...
am: 2e99c38cfd
Change-Id: I948a78eb97fbc098610d3410f126843e360e5f65
2017-08-17 00:42:39 +00:00
Tao Bao
2e99c38cfd
Merge "screen_ui: Fix a case that may truncate the last char."
2017-08-17 00:16:04 +00:00
Tao Bao
13aa4a902b
screen_ui: Fix a case that may truncate the last char.
...
ScreenRecoveryUI::DrawWrappedTextLines() should be called with
kMarginWidth only. Because it's using a line limit of text_cols_,
which is unaware of kMenuIdent.
Bug: 64293520
Test: No missing char with long header text.
Change-Id: Ib4d08de2c56473a483ff9964eb6cec31f8a74c9a
2017-08-16 13:38:17 -07:00
Bill Yi
1c568e3342
Import translations. DO NOT MERGE am: 20fa1a92cc -s ours
...
am: 91487964b0 -s ours
Change-Id: Ic68759c25fba8d762db9b09e8cf2cb1a161dc43e
2017-08-16 15:48:33 +00:00
Bill Yi
91487964b0
Import translations. DO NOT MERGE
...
am: 20fa1a92cc -s ours
Change-Id: I2849c371f53a02857ec9d14a7565def9130305ea
2017-08-16 15:44:34 +00:00
Tao Bao
4e279cf5d7
Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111 am: f1397b597a
...
am: 5cfb65af51
Change-Id: I08997dedf6684cfe80f29e4f329aca226c00241e
2017-08-16 05:19:26 +00:00
Tao Bao
5cfb65af51
Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9 am: ae0af37111
...
am: f1397b597a
Change-Id: Iaccb1c1f1b8eeb5c226f51daaca95403fd6aa21d
2017-08-16 05:16:25 +00:00
Tao Bao
f1397b597a
Merge "screen_ui: Word-wrap menu headers." am: 162b92323b am: 623bac4ed9
...
am: ae0af37111
Change-Id: Ibb4a439d7a864e8fc44b06cad66a07f18f3376f7
2017-08-16 05:13:56 +00:00
Tao Bao
ae0af37111
Merge "screen_ui: Word-wrap menu headers." am: 162b92323b
...
am: 623bac4ed9
Change-Id: If8d200cd487aed9ee5eedbe831e1436e4c3551da
2017-08-16 05:10:55 +00:00
Tao Bao
623bac4ed9
Merge "screen_ui: Word-wrap menu headers."
...
am: 162b92323b
Change-Id: I93c959422c5b56a15875580159ecfc1a1d44087d
2017-08-16 05:07:55 +00:00
Tao Bao
162b92323b
Merge "screen_ui: Word-wrap menu headers."
2017-08-16 05:02:05 +00:00
Bill Yi
20fa1a92cc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I7e9049129d9a886cac53a1f6438d9c733fb3d3d8
2017-08-15 20:14:00 -07:00
Tao Bao
2bbc6d642d
screen_ui: Word-wrap menu headers.
...
This CL adds ScreenRecoveryUI::DrawWrappedTextLines() to better handle
long menu header texts. It does a word wrap at spaces, if available.
This avoids fixed-length menu headers being truncated on small screens.
Bug: 64293520
Test: On bullhead, boot into recovery with --prompt_and_wipe_data, and
check the prompt texts.
Change-Id: Ia22746583516dd230567a267584aca558429395e
2017-08-15 15:10:21 -07:00
Tianjie Xu
4de77886e4
Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acec am: bfd3123a6a
...
am: cc41fc4384
Change-Id: I92156cbe77678253265feea4288ac96bfed486d9
2017-08-14 17:42:27 +00:00
Tianjie Xu
cc41fc4384
Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8 am: 96b490acec
...
am: bfd3123a6a
Change-Id: I63526e65325b53afd630343a6a55bbca39f1b74f
2017-08-14 17:38:30 +00:00
Tianjie Xu
bfd3123a6a
Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062 am: 5bde1d9ef8
...
am: 96b490acec
Change-Id: I9656f313d5d3746ac9c9ecd98311b88d8754b3e1
2017-08-14 17:34:57 +00:00
Tianjie Xu
96b490acec
Merge "Add a new PatchChunk class in imgdiff" am: 11214d9062
...
am: 5bde1d9ef8
Change-Id: Iccd45b9c2673237a0e8775d9527eb35f0aa2b869
2017-08-14 17:31:26 +00:00
Tianjie Xu
5bde1d9ef8
Merge "Add a new PatchChunk class in imgdiff"
...
am: 11214d9062
Change-Id: Ic2d4b218b36ace3dd1d49be1d17adeaf2d37b108
2017-08-14 17:26:56 +00:00
Tianjie Xu
11214d9062
Merge "Add a new PatchChunk class in imgdiff"
2017-08-14 17:21:16 +00:00
Tianjie Xu
d82a2ed50b
Add a new PatchChunk class in imgdiff
...
This way we can keep the input images const when calling
genetatepatches().
Test: recovery component test; diff and patch on chrome.apk; generate
recovery-from-boot.p for angler.
Change-Id: I65b5689b88f6719c6ede46bb82def0c4caeb8a61
2017-08-12 22:07:43 -07:00
Bill Yi
616256e739
Import translations. DO NOT MERGE
...
Change-Id: I99a2cf060c75a70b3baf3c22d538fbfa08828474
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-12 06:53:13 -07:00
David Zeuthen
57eeb9b70a
update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 am: db9ec51c39
...
am: 5cb56fbf76
Change-Id: I2cf483c1f99d042a34b477ecf949cff35f0450c4
2017-08-10 21:28:21 +00:00
David Zeuthen
5cb56fbf76
update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76
...
am: db9ec51c39
Change-Id: I74ed15e22a3f78d673e838515cf989863575044e
2017-08-10 21:11:40 +00:00
David Zeuthen
db9ec51c39
update_verifier: Support androidboot.veritymode being empty or 'disabled'.
...
am: 3222dc0d76
Change-Id: I31ce6bf1e82269a45e3d49bda961359f7dd8bab9
2017-08-10 21:00:09 +00:00
David Zeuthen
dd9939fc9b
update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76 am: 9cf2e9798f
...
am: da7c1e4492
Change-Id: If52ddeb0189abe8e83bfac418f1a6661c351df8f
2017-08-10 21:00:09 +00:00
David Zeuthen
da7c1e4492
update_verifier: Support androidboot.veritymode being empty or 'disabled'. am: 3222dc0d76
...
am: 9cf2e9798f
Change-Id: I4af28a7b975393f9f789c200577d9bd83d1902c1
2017-08-10 20:56:39 +00:00
David Zeuthen
9cf2e9798f
update_verifier: Support androidboot.veritymode being empty or 'disabled'.
...
am: 3222dc0d76
Change-Id: I20dc5fce9e5adf002acf0e918d843c681286a8fc
2017-08-10 20:53:08 +00:00
Tao Bao
c3c85bd889
Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 am: 5156e24ccf am: 37b9d108a9
...
am: 0bbd31b865
Change-Id: Ib0248c92d2f0bf267134e1b0b1f8bce842e7f3f9
2017-08-10 16:44:55 +00:00
Tao Bao
0bbd31b865
Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4 am: 5156e24ccf
...
am: 37b9d108a9
Change-Id: I99ce9776fc0597d93315295a7a81600231efa3ed
2017-08-10 16:41:23 +00:00
Tao Bao
37b9d108a9
Merge "update_verifier: verify blocks in parallel" am: 0459799ea8 am: 1fa82a2af4
...
am: 5156e24ccf
Change-Id: I84945b9ef0d8ae985e5200c2e5dec95ce4da2b9d
2017-08-10 16:37:22 +00:00
Tao Bao
5156e24ccf
Merge "update_verifier: verify blocks in parallel" am: 0459799ea8
...
am: 1fa82a2af4
Change-Id: Ieeabe5fc76d25a4c22164c0e61d3a93b046cd8c7
2017-08-10 16:33:23 +00:00
Tao Bao
1fa82a2af4
Merge "update_verifier: verify blocks in parallel"
...
am: 0459799ea8
Change-Id: Ic8ce7a45de3a7501f7e1f758c7ddf56ff5d919e3
2017-08-10 16:30:03 +00:00
Tao Bao
0459799ea8
Merge "update_verifier: verify blocks in parallel"
2017-08-10 16:24:38 +00:00
Tao Bao
8bbcf6d75f
Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee am: 46c13f3f05 am: 6f1c38c9ad
...
am: b5fa329795
Change-Id: Idd39efb798d72cb96235a1ba01e633dee7be1c92
2017-08-10 06:36:12 +00:00
Tao Bao
b5fa329795
Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee am: 46c13f3f05
...
am: 6f1c38c9ad
Change-Id: I6e32f2653681816140d06cf3135d343937dd3bc4
2017-08-10 06:23:46 +00:00
Tao Bao
6f1c38c9ad
Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad am: 43df6cfeee
...
am: 46c13f3f05
Change-Id: Iaa1bd4f403664a87153b9f6b647e04bc7798a33d
2017-08-10 06:10:14 +00:00
Tao Bao
46c13f3f05
Merge "tests: Add the missing dependency on libhidlbase." am: 05b2e982ad
...
am: 43df6cfeee
Change-Id: I1b6aec75eda5a289cc3cd6a72029d90d9ba4c433
2017-08-10 06:06:43 +00:00
Tao Bao
43df6cfeee
Merge "tests: Add the missing dependency on libhidlbase."
...
am: 05b2e982ad
Change-Id: Ie08dca777af1d12a304aebf11f4df25680ff939a
2017-08-10 06:03:45 +00:00
Wei Wang
5226f4715d
update_verifier: verify blocks in parallel
...
This CL is to change update_verifier to verify blocks in parallel to
maximize storage bandwidth, it also preallocate the buffer to avoid
vector allocation within reading loop.
Test:
care_map.txt:
system
16,0,517,556,32770,33084,98306,98620,163842,164156,229378,229692,294914,295228,483544,524288,524296
vendor
8,0,119,135,32770,32831,96150,98304,98306
With CL:
init: Service 'update_verifier_nonencrypted' (pid 711) exited with status 0 waiting took 2.978424 seconds
Without CL:
init: Service 'update_verifier_nonencrypted' (pid 695) exited with status 0 waiting took 4.466320 seconds
Bug: 63686531
Test: reboot with manual insert care_map.txt
Change-Id: Idf791865f15f6ff6cad89bf7ff230ee46c6adccc
(cherry picked from commit bd9664b5a0 )
2017-08-09 22:59:16 -07:00
Tao Bao
05b2e982ad
Merge "tests: Add the missing dependency on libhidlbase."
2017-08-10 05:58:49 +00:00
Tao Bao
3e2345e1fe
tests: Add the missing dependency on libhidlbase.
...
It fails to build recovery_component_test with the following errors:
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::hidl_string(android::hardware::hidl_string const&)'
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::operator=(android::hardware::hidl_string
const&)'
out/soong/.intermediates/hardware/interfaces/boot/1.0/android.hardware.boot@1.0_genc++_headers/gen/android/hardware/boot/1.0/types.h:14:
error: undefined reference to 'android::hardware::hidl_string::~hidl_string()'
libupdate_verifier includes <android/hardware/boot/1.0/IBootControl.h>,
which includes the 'types.h' above. In 'types.h', it defines struct
CommandResult that's using android::hardware::hidl_string.
Since libhidlbase doesn't have a static library target, remove
'LOCAL_FORCE_STATIC_EXECUTABLE := true', which isn't required for
running tests.
Test: mmma -j bootable/recovery
Bug: 64538692
Change-Id: Iaa7c08adc241128d787274fcaea9b363e7ff93f4
(cherry picked from commit 102016ce1f )
2017-08-09 22:57:13 -07:00
Wei Wang
9186bee3d1
Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev am: 1f4229ff95
...
am: 22cf0224fd
Change-Id: I7dfc82b7b3286711e13a70a773b488139a210d16
2017-08-10 03:30:03 +00:00
Wei Wang
2ae88bba70
update_verifier: verify blocks in parallel am: bd9664b5a0
...
am: 4bf7032066
Change-Id: Id1ed6e8d1903db2f879fc9c0bfa85caddcf8e248
2017-08-10 03:30:00 +00:00
Wei Wang
22cf0224fd
Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev
...
am: 1f4229ff95
Change-Id: I80603def879d1837bdcd6ec48aeeef22b635fa00
2017-08-10 02:45:28 +00:00
Wei Wang
4bf7032066
update_verifier: verify blocks in parallel
...
am: bd9664b5a0
Change-Id: Iebaa6b6589ad9bee9eb8b89101f41bccf749212f
2017-08-10 02:45:24 +00:00
Wei Wang
1f4229ff95
Merge "tests: Add the missing dependency on libhidlbase." into oc-mr1-dev
2017-08-10 02:32:47 +00:00