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

5064 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
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 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 91487964b0 Import translations. DO NOT MERGE 
am: 20fa1a92cc  -s ours

Change-Id: I2849c371f53a02857ec9d14a7565def9130305ea
 2017-08-16 15:44:34 +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