Tao Bao
8d88fbcfe8
Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce am: 813120749d
...
am: 99c932716a
Change-Id: Id6fb5f3a2ef9135e5cfb0caa147a0640505492fc
2017-08-28 20:38:39 +00:00
Tao Bao
99c932716a
Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f am: f351a576ce
...
am: 813120749d
Change-Id: I8a52750375fd46b43b8135d75fe1dd3940c8a36c
2017-08-28 20:06:07 +00:00
Tao Bao
813120749d
Merge "wear_ui: Remove dead 'self' and 'progress_t'." am: 2e125bec2f
...
am: f351a576ce
Change-Id: Ida6b81f4d87550503e6a77e7163c1c50ebe0e36a
2017-08-28 19:57:06 +00:00
Tao Bao
f351a576ce
Merge "wear_ui: Remove dead 'self' and 'progress_t'."
...
am: 2e125bec2f
Change-Id: Ied701c23bacf63048adce28b18cd6847f8134097
2017-08-28 19:52:06 +00:00
Tao Bao
2e125bec2f
Merge "wear_ui: Remove dead 'self' and 'progress_t'."
2017-08-28 19:41:54 +00:00
Tao Bao
cff8269e5c
wear_ui: Remove dead 'self' and 'progress_t'.
...
They were once used for progress_thread() that's pthread_create'd by
WearRecoveryUI::Init(). They have become dead since the removal of
progress_thread() (commit ad8b5a6c11 ).
Also add the missing include of <pthread.h> for pthread_mutex_lock().
Test: lunch a watch target and `m recoveryimage`.
Change-Id: I748cf4511434ac4ce97dddf89b0e42e68a5da04b
2017-08-26 08:17:36 -07:00
Tianjie Xu
e29807352a
Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e am: f134f0e5c0
...
am: 639fce1c4d
Change-Id: I089173b6b1a71d72c20d2564a8982c9a7f8c37c3
2017-08-24 22:51:44 +00:00
Tianjie Xu
639fce1c4d
Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e
...
am: f134f0e5c0
Change-Id: I4257c6bb5b2e98b3a50d6c824820ea2293a58d38
2017-08-24 22:37:12 +00:00
Tianjie Xu
f134f0e5c0
Merge "Add missing report of error code under recovery" am: 571855b0e6
...
am: 736be2f93e
Change-Id: Ia2be72d6efac6be06178640c3b6ab716e99c6edf
2017-08-24 22:28:10 +00:00
Tianjie Xu
736be2f93e
Merge "Add missing report of error code under recovery"
...
am: 571855b0e6
Change-Id: Ib425356561060c20e0f9643e2f5b302f5c9dd161
2017-08-24 22:25:10 +00:00
Tianjie Xu
571855b0e6
Merge "Add missing report of error code under recovery"
2017-08-24 22:10:25 +00:00
Bill Yi
7b795abd13
Import translations. DO NOT MERGE
...
Change-Id: I8fb3f973ecd0dfe54dea048ef445d45902eae028
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-23 19:34:04 -07:00
Tianjie Xu
3fec8c6419
Add missing report of error code under recovery
...
Add report of kMapFileFailure, kForkUpdateBinaryFailure and
kUpdateBinaryCommandFailure.
Test: unit test pass; kMapFileFailure reports correctly.
Change-Id: I858c81b6c750b5e300b1b12760b1f0fa8e23b47d
2017-08-23 00:18:07 -07:00
Tianjie Xu
eea908e123
Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 am: 968ebdeefd am: 7379a5290d
...
am: f715057fa3
Change-Id: I5cc38e615cb7b5ab504e73ecd69efcb65c9c40d6
2017-08-23 00:33:51 +00:00
Tianjie Xu
f715057fa3
Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5 am: 968ebdeefd
...
am: 7379a5290d
Change-Id: I9addf18a86c95ab29be77b616d1688a3bb6abd05
2017-08-22 23:40:43 +00:00
Tianjie Xu
7379a5290d
Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55 am: e8b02d68e5
...
am: 968ebdeefd
Change-Id: I21de76c870001cb5faf145d5f39f8fb2cfa58a66
2017-08-22 23:23:07 +00:00
Tianjie Xu
968ebdeefd
Merge "Allow comparison against multi serial nums for A/B package" am: 3810046a55
...
am: e8b02d68e5
Change-Id: Id75270416e1058776b7ed27a4a2d926895f9bf0e
2017-08-22 23:09:57 +00:00
Tianjie Xu
e8b02d68e5
Merge "Allow comparison against multi serial nums for A/B package"
...
am: 3810046a55
Change-Id: Ic9e431b0d31c61484b04ce4f491a584b3eeba09c
2017-08-22 23:00:01 +00:00
Tianjie Xu
3810046a55
Merge "Allow comparison against multi serial nums for A/B package"
2017-08-22 22:40:47 +00:00
Tianjie Xu
69b9649e9b
Allow comparison against multi serial nums for A/B package
...
The metadata file now can have multiple serial numbers in the format:
serialno=serialno1|serialno2|serialno3 ...
Verifier will pass the check if the device serial number matches any of
these numbers.
Bug: 64802465
Test: Create a metadata file with 1000 numbers and sideload in sailfish.
The checker detects both match and mismatch cases.
Change-Id: I3f12b75e15f4179df260778e37f4563d65db0fa8
2017-08-22 12:05:52 -07:00
Tao Bao
b277330d81
Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b am: cdc6fcaa47 am: 0d0b6a0d2a
...
am: a2551fbcd4
Change-Id: I9e4027f48ab3f7dba55ac6187bd7481d6268958d
2017-08-22 18:50:53 +00:00
Tao Bao
a2551fbcd4
Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b am: cdc6fcaa47
...
am: 0d0b6a0d2a
Change-Id: I0b940413b5611f63337cccde22519f6bf913efb6
2017-08-22 18:45:14 +00:00
Tao Bao
0d0b6a0d2a
Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a am: cead180a2b
...
am: cdc6fcaa47
Change-Id: I50f470bc0f772a372a7e36f8726aa5a91b653939
2017-08-22 18:40:35 +00:00
Tao Bao
cdc6fcaa47
Merge changes I5d7a6baa,Id0fb2d4e am: 89ad02206a
...
am: cead180a2b
Change-Id: Iebb98c53e659eae15a2092610ebcd1b57a939c96
2017-08-22 18:38:02 +00:00
Tao Bao
cead180a2b
Merge changes I5d7a6baa,Id0fb2d4e
...
am: 89ad02206a
Change-Id: If9a85999d04902e68a3c807d05f3796ac273d3d1
2017-08-22 18:30:56 +00:00
Tao Bao
cce04d085f
Merge changes from topic "bug-64307776" into oc-mr1-dev am: 2e1b3a418e
...
am: 9ad6dc6d6f
Change-Id: I7e06b22c56a82ffdfab450509806cca23b049cd5
2017-08-22 17:51:58 +00:00
Tao Bao
9ad6dc6d6f
Merge changes from topic "bug-64307776" into oc-mr1-dev
...
am: 2e1b3a418e
Change-Id: I48546e13fdba9a33df76096e020c3e04d5e69ecd
2017-08-22 17:49:51 +00:00
Tao Bao
89ad02206a
Merge changes I5d7a6baa,Id0fb2d4e
...
* changes:
wear_ui: Expose menu_unusable_rows via Makefile var.
Allow customizing WearRecoveryUI via Makefile variables.
2017-08-22 17:44:16 +00:00
Tao Bao
2e1b3a418e
Merge changes from topic "bug-64307776" into oc-mr1-dev
...
* changes:
wear_ui: Expose menu_unusable_rows via Makefile var.
Allow customizing WearRecoveryUI via Makefile variables.
2017-08-22 17:36:06 +00:00
Tianjie Xu
28bb87bbc5
Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 am: f5e3cadeca am: fc569d1516
...
am: 7d1d5b2f1c
Change-Id: Ibd4887d4094150ddce6d57edd809c1efaef50762
2017-08-19 04:39:34 +00:00
Tianjie Xu
7d1d5b2f1c
Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09 am: f5e3cadeca
...
am: fc569d1516
Change-Id: I1d6e5f4aeaca59823fc05c3d655dfc8ca7f3e0ab
2017-08-19 04:36:34 +00:00
Tianjie Xu
fc569d1516
Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39 am: b127fddf09
...
am: f5e3cadeca
Change-Id: Ic9056467184e272eec5c0aead3d4a712033b0503
2017-08-19 04:34:03 +00:00
Tianjie Xu
f5e3cadeca
Merge "Move Image/ImageChunk/PatchChunk declaration into header files" am: b4bc57ed39
...
am: b127fddf09
Change-Id: Ia1eb8977d076c5ee5557d850afaad5e4a689bc63
2017-08-19 04:30:33 +00:00
Tianjie Xu
b127fddf09
Merge "Move Image/ImageChunk/PatchChunk declaration into header files"
...
am: b4bc57ed39
Change-Id: If254ed9e24bc0cafa19db9766ed36643ca0fed49
2017-08-19 04:27:34 +00:00
Tianjie Xu
b4bc57ed39
Merge "Move Image/ImageChunk/PatchChunk declaration into header files"
2017-08-19 04:21:05 +00:00
Tianjie Xu
57dd961995
Move Image/ImageChunk/PatchChunk declaration into header files
...
1. Move the declaration of the Image classes to the header file to make
testing easier.
2. Also move rangeset.h to bootable/recovery to allow access in imgdiff.
Test: recovery component test
Change-Id: I68a863e60a3f2e7ae46ee48f48eb15391f5f4330
2017-08-18 17:56:22 -07:00
Tianjie Xu
8a913dfaad
Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a am: 8c9c22a3a9 am: 14b3f5e5cc
...
am: f579907b8a
Change-Id: I4854759427257b18ecb13819c22d95ebfb93b5a8
2017-08-17 19:32:31 +00:00
Tianjie Xu
f579907b8a
Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a am: 8c9c22a3a9
...
am: 14b3f5e5cc
Change-Id: Ie5ac1c1604669563e2bb7be550e5b0c5945f5d3a
2017-08-17 19:29:59 +00:00
Tianjie Xu
14b3f5e5cc
Merge "update_verifier now logs to kmesg" am: f7ad94313d am: 473606847a
...
am: 8c9c22a3a9
Change-Id: I2e9d3883edb4de803924ff127cf876cc1f6dd485
2017-08-17 19:26:35 +00:00
Tianjie Xu
8c9c22a3a9
Merge "update_verifier now logs to kmesg" am: f7ad94313d
...
am: 473606847a
Change-Id: I90f254955823bc815d96bf94ae1b2f37c2b0a44a
2017-08-17 19:22:59 +00:00
Tianjie Xu
473606847a
Merge "update_verifier now logs to kmesg"
...
am: f7ad94313d
Change-Id: I24438ea3f7975608358cf676606dc54b98e7092a
2017-08-17 19:19:32 +00:00
Tianjie Xu
f7ad94313d
Merge "update_verifier now logs to kmesg"
2017-08-17 19:16:11 +00:00
TreeHugger Robot
462a7eed46
Merge "Import translations. DO NOT MERGE"
2017-08-17 12:15:41 +00:00
Bill Yi
e332c5ad0e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64680434
Change-Id: Ie356071f322238a5fb3a4610d2a79141c9aa9377
2017-08-17 00:34:01 -07:00
Tao Bao
78c08cf6da
screen_ui: Fix a case that may truncate the last char. am: 2cf6fe2ced
...
am: 96210f88ce
Change-Id: I8396ade4136e6554ced169ad503b11599a37c57c
2017-08-17 04:57:40 +00:00
Tao Bao
4af9235dc1
screen_ui: Word-wrap menu headers. am: ee6fefd2f2 -s ours
...
am: 0a7f4d4f71
Change-Id: I379cbd56489a7cba1279a88841f0c001cb37790c
2017-08-17 04:57:35 +00:00
Tao Bao
96210f88ce
screen_ui: Fix a case that may truncate the last char.
...
am: 2cf6fe2ced
Change-Id: Icb478835c9ad403cee686176c24d74cad4c7a0c3
2017-08-17 04:33:25 +00:00
Tao Bao
0a7f4d4f71
screen_ui: Word-wrap menu headers.
...
am: ee6fefd2f2 -s ours
Change-Id: I92adb84d393433db89bb267c8b049fb1a191bfdb
2017-08-17 04:33:22 +00:00
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