Commit Graph

5086 Commits

Author SHA1 Message Date
Tianjie Xu a8c009106c Merge "Turn on -Wall for libedify" am: deb5de0bc1 am: 365059c61b
am: 36983d8dd0

Change-Id: I28fe4e12228bf6c75280c04f27407e2ee8588e67
2017-08-31 00:03:02 +00:00
Tianjie Xu 36983d8dd0 Merge "Turn on -Wall for libedify" am: deb5de0bc1
am: 365059c61b

Change-Id: Ib17d03c23bb3a94cbd886190ccfeb0a323d8143b
2017-08-30 23:43:24 +00:00
Tianjie Xu 365059c61b Merge "Turn on -Wall for libedify"
am: deb5de0bc1

Change-Id: Iace07e47ed07ce3e7336ab93a22cdfd53cfca778
2017-08-30 23:32:51 +00:00
Tianjie Xu deb5de0bc1 Merge "Turn on -Wall for libedify" 2017-08-30 23:04:53 +00:00
Tianjie Xu c7cd918c15 Turn on -Wall for libedify
Bug: 64939312
Test: mma
Change-Id: Ia4afc6241b1f11ce261be6840f21a793b23014a6
2017-08-30 23:04:35 +00:00
Bill Yi 5dac1e08ea Import translations. DO NOT MERGE
am: c16d222593  -s ours

Change-Id: Ie85856e9683cba8534abc07f4f7dbd0dee19ead9
2017-08-30 00:46:13 +00:00
Bill Yi c16d222593 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ife1e0455a5433bc0cb0e15b0aabf2beef1ba8827
2017-08-29 13:28:09 -07:00
Tianjie Xu eb958f0d9e Merge "Turn on -Wall for recovery modules" am: 11f68b6b69 am: 44d0b008c6
am: 447da69c14

Change-Id: Ic2cba08a3e9f691f94e0adccc767ab0e7ea73d67
2017-08-29 17:45:17 +00:00
Tianjie Xu 447da69c14 Merge "Turn on -Wall for recovery modules" am: 11f68b6b69
am: 44d0b008c6

Change-Id: I61ffc86b34762e90e8be8225cb8ab9cc428c3b61
2017-08-29 17:38:28 +00:00
Tianjie Xu 44d0b008c6 Merge "Turn on -Wall for recovery modules"
am: 11f68b6b69

Change-Id: I5f0531de7880682c7dfe75a6274f41519e0c64d6
2017-08-29 17:34:28 +00:00
Tianjie Xu 11f68b6b69 Merge "Turn on -Wall for recovery modules" 2017-08-29 17:21:09 +00:00
Tianjie Xu c89d1e7e2a Turn on -Wall for recovery modules
Turn on -Wall for all modules. Also remove the obsolete file_cmp() in
apply_patch test and now() in wear_ui.

The only exception is lib_edify due to the unused functions in the
intermediate cpp files generated from the lex files. It will be handled
in a seperate CL.

Bug: 64939312
Test: mma, unit tests pass
Change-Id: Ic53f76b60b6401ab20db3d98130d674c08e3702f
2017-08-28 21:56:33 -07:00
Jerry Zhang 94c7f017d6 Merge "Add libasyncio." am: d179c923d8 am: d21fb1ece0
am: 4dc141e6ba

Change-Id: Ia52bb1b556822cfa3adbe89ec0e414da851f1213
2017-08-29 03:48:07 +00:00
Jerry Zhang 4dc141e6ba Merge "Add libasyncio." am: d179c923d8
am: d21fb1ece0

Change-Id: I8b42f0c03f8a95d6ce10cf7ac229106059273610
2017-08-29 03:43:03 +00:00
Jerry Zhang d21fb1ece0 Merge "Add libasyncio."
am: d179c923d8

Change-Id: If89169d9c962fcbf2a347cd1cb781171421ea85b
2017-08-29 03:38:10 +00:00
Treehugger Robot d179c923d8 Merge "Add libasyncio." 2017-08-29 03:28:25 +00:00
Tao Bao f0487569fa Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0 am: d92baf5988
am: 35d36d1fa6

Change-Id: I12f355cba92116ddb2616248d846067041af6ec9
2017-08-28 20:06:26 +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 35d36d1fa6 Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." am: e9605b8ca0
am: d92baf5988

Change-Id: Id98f998569e0e07296d69030c3d555cd32203e70
2017-08-28 19:57:19 +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 d92baf5988 Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_."
am: e9605b8ca0

Change-Id: I4f2ee4b8f545151b76dc47791394e91959243bdf
2017-08-28 19:52:21 +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 e9605b8ca0 Merge "wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_." 2017-08-28 19:42:12 +00:00
Tao Bao 2e125bec2f Merge "wear_ui: Remove dead 'self' and 'progress_t'." 2017-08-28 19:41:54 +00:00
Tao Bao 1e27d14eea wear_ui: Remove kMaxCols/kMaxRows/visible_text_rows/menu_headers_.
We've deprecated kMaxCols/kMaxRows in ScreenRecoveryUI since commit
aa0d6afb61. They unnecessarily limit the
screen size to 96x96 characters.

Also remove the recomputations of text_cols, visible_text_rows (which is
the same as text_rows_). Remove the unintentional hiding of menu_headers_.

Test: mmma bootable/recovery
Change-Id: I7d1526b651943312d62d52cd200414b42bf9b12a
2017-08-26 08:47:43 -07: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 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
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 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 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 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 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