PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,107 Commits 1 Branch 0 Tags
eea908e12345929bb93acffddeb4de326d300fc7
Commit Graph

5107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 2cf6fe2ced 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
(cherry picked from commit 13aa4a902b)
 2017-08-16 17:04:53 -07: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
Tao Bao ee6fefd2f2 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
(cherry picked from commit 2bbc6d642d)
 2017-08-16 11:03:31 -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