PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,365 Commits 1 Branch 0 Tags
821d03bb6f53ac4ef772fa39159a4beba103ffd5
Commit Graph

6365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao 821d03bb6f Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a am: 941d3ab754 
am: e2777de4b0

Change-Id: Iba67f83a455a57c574072f9eff110c5d4823b279
 2018-06-09 09:04:43 -07:00
Tao Bao e2777de4b0 Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." am: 0eb10b382a 
am: 941d3ab754

Change-Id: I2f6b30d6a7698dbde35cbaec6be835cd493c1b29
 2018-06-09 05:28:40 -07:00
Xin Li e6a3f9e91a Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master am: d8a411c90a 
am: d320d12235

Change-Id: Ie8013b062620dd6efd5d018527314c301120238f
 2018-06-09 05:16:46 -07:00
Xin Li d320d12235 Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master 
am: d8a411c90a

Change-Id: Ifc15b0365a972264e00e49325106ddca7072c1c9
 2018-06-09 01:45:12 -07:00
Tao Bao 941d3ab754 Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." 
am: 0eb10b382a

Change-Id: I0bba5a09ac62b7c152d22d72f0432868008592cc
 2018-06-08 16:50:38 -07:00
Xin Li d8a411c90a Merge "Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master" into stage-aosp-master 2018-06-08 23:09:59 +00:00
Tao Bao 0eb10b382a Merge "updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3()." 2018-06-08 23:01:59 +00:00
Tao Bao 4fed385c6c Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d am: 165a197cdf 
am: 73ab0d12ce

Change-Id: Ib47393372937056314013d288a30f375157547e1
 2018-06-08 12:56:03 -07:00
Tao Bao 4a13508f0b updater: Drop the 'overlap' parameter in LoadSrcTgtVersion3(). 
Test: Run recovery_component_test on marlin.
Change-Id: I93afca891c5c9c1a351c907b023cd20c4704a66a
 2018-06-08 12:53:31 -07:00
Tao Bao 73ab0d12ce Merge "updater: Remove the redundant check on line count." am: 4a8f5ec06d 
am: 165a197cdf

Change-Id: Ifd6cda9da86575fd8036a0322fa3456c8d4d5147
 2018-06-08 12:48:07 -07:00
Tao Bao 165a197cdf Merge "updater: Remove the redundant check on line count." 
am: 4a8f5ec06d

Change-Id: Iabb63de552d823305fd6330d9819d5ec32718ebc
 2018-06-08 12:44:00 -07:00
Tao Bao 4a8f5ec06d Merge "updater: Remove the redundant check on line count." 2018-06-08 19:29:45 +00:00
Xin Li b5c2c714f0 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master 
Bug: 79597307
Change-Id: Iaf450edb8262cef5465f06309556ab24a08222b4
 2018-06-08 11:06:44 -07:00
Zhomart Mukhamejanov 4b5dc30a92 Merge "updater_sample: update README.md" am: 1cb7222784 am: fc824cb998 
am: c54885f8a1

Change-Id: Idb73d3e3bdbbc9053045d0813e34a93bdcaf5604
 2018-06-07 19:34:34 -07:00
Zhomart Mukhamejanov 2a13ae72d0 Merge "updater_sample: fix payload spec tests" am: 684d7216e6 am: 7c8e5b6ee8 
am: 31b517c510

Change-Id: I9a8101831c087d98fa3350a754ef5ffcff8ce592
 2018-06-07 19:28:02 -07:00
Zhomart Mukhamejanov c54885f8a1 Merge "updater_sample: update README.md" am: 1cb7222784 
am: fc824cb998

Change-Id: If5ec06c7974cf6c174ce812e49b20d6dc67c1181
 2018-06-07 18:07:06 -07:00
Zhomart Mukhamejanov 31b517c510 Merge "updater_sample: fix payload spec tests" am: 684d7216e6 
am: 7c8e5b6ee8

Change-Id: I2a413794f315f53000f937760595d5ba99c1755f
 2018-06-07 17:25:33 -07:00
Zhomart Mukhamejanov fc824cb998 Merge "updater_sample: update README.md" 
am: 1cb7222784

Change-Id: I4347b45f3d0abc9fa93bc70b42ec6df94be595e4
 2018-06-07 16:39:05 -07:00
Zhomart Mukhamejanov 7c8e5b6ee8 Merge "updater_sample: fix payload spec tests" 
am: 684d7216e6

Change-Id: I2aac8aa24dd5d4287010ea2b8e70828671858864
 2018-06-07 16:38:08 -07:00
Zhomart Mukhamejanov 1cb7222784 Merge "updater_sample: update README.md" 2018-06-07 22:50:09 +00:00
Zhomart Mukhamejanov ec33e4504c updater_sample: update README.md 
Test: n/a
Change-Id: I0b488ca9fe628c3614c203ab9264175f291f49db
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-06-07 22:49:22 +00:00
Zhomart Mukhamejanov 684d7216e6 Merge "updater_sample: fix payload spec tests" 2018-06-07 22:49:14 +00:00
Zhomart Mukhamejanov 8a6a86a101 updater_sample: fix payload spec tests 
Test: junit4
Change-Id: Ia2f7475cfba01a65486bb0e5d0f3976304ca0969
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-06-07 12:07:20 -07:00
Tao Bao ffede3e8d9 updater: Remove the redundant check on line count. 
Test: recovery_component_test on marlin.
Change-Id: I2ac2bd47469d1aec8a97a8c4ed0fe80ffd65c95b
 2018-06-07 10:43:24 -07:00
Zhomart Mukhamejanov 30f1d99a91 Merge "updater_sample: change gen_update_config args" am: eeabbecb64 am: 493e6cb9e0 
am: 0f191fc8f6

Change-Id: I1a034e70f0507c89f706f704b75572d4cd24eeed
 2018-06-07 09:13:12 -07:00
Zhomart Mukhamejanov 0f191fc8f6 Merge "updater_sample: change gen_update_config args" am: eeabbecb64 
am: 493e6cb9e0

Change-Id: I12371f4985c5d39eb3b7361cf5ef9e167eddc8a3
 2018-06-07 09:09:39 -07:00
Zhomart Mukhamejanov 493e6cb9e0 Merge "updater_sample: change gen_update_config args" 
am: eeabbecb64

Change-Id: I5d8a229fce5599762f290a583d779808dc836b23
 2018-06-07 09:05:37 -07:00
Zhomart Mukhamejanov eeabbecb64 Merge "updater_sample: change gen_update_config args" 2018-06-07 15:53:20 +00:00
Zhomart Mukhamejanov 26e8689f60 Merge "updater_sample: Add suspend/resume update" am: 382691fbb0 am: f4c1420742 
am: e202fa8949

Change-Id: Ifcb3122ce85097e6c773463d41c5011fd84ae5ef
 2018-06-06 19:04:19 -07:00
Tao Bao d2d0456d98 Merge "updater: Replace the reference arguments with pointers." am: cef8431fed am: 9c22d924e8 
am: a0e3e6f489

Change-Id: I0282aade49d1eb22b6fce4238186f441a5afee8b
 2018-06-06 19:01:41 -07:00
Zhomart Mukhamejanov e202fa8949 Merge "updater_sample: Add suspend/resume update" am: 382691fbb0 
am: f4c1420742

Change-Id: Idbdb61d87c1ce5ddde1de04b00909675dfe467e5
 2018-06-06 18:57:06 -07:00
Tao Bao a0e3e6f489 Merge "updater: Replace the reference arguments with pointers." am: cef8431fed 
am: 9c22d924e8

Change-Id: Ibb4ee1d240768e2cb941d1c4c89e5584c126290b
 2018-06-06 18:55:06 -07:00
Zhomart Mukhamejanov da96070ffd updater_sample: change gen_update_config args 
Change gen_update_config arg '--ab_force_switch_slot'
from 'bool' to 'store_action'.

Test: manually
Change-Id: Ic65ac9ca3feb99b3a1751a44dec038d49c2b446a
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
 2018-06-06 18:38:51 -07:00
Zhomart Mukhamejanov f4c1420742 Merge "updater_sample: Add suspend/resume update" 
am: 382691fbb0

Change-Id: Ibd18c8751b2a157aaaf9139bbb01ba0ec84101b7
 2018-06-06 18:30:00 -07:00
Zhomart Mukhamejanov 382691fbb0 Merge "updater_sample: Add suspend/resume update" 2018-06-07 00:49:09 +00:00
Tianjie Xu a8900ef91e Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739 am: c8d9d6ca17 
am: 3e9493d891

Change-Id: Ibd115e5ebe71016443c56539dfd359a2cd39c2e5
 2018-06-06 17:33:47 -07:00
Tao Bao 9c22d924e8 Merge "updater: Replace the reference arguments with pointers." 
am: cef8431fed

Change-Id: Iae45ce2282661f97f5726b1ee1e4db6a6e6af503
 2018-06-06 17:08:25 -07:00
Tao Bao cef8431fed Merge "updater: Replace the reference arguments with pointers." 2018-06-06 23:07:07 +00:00
Tianjie Xu 3e9493d891 Merge "minui: Handle the failures from the drm backend in gr_init" am: 0e2d900739 
am: c8d9d6ca17

Change-Id: I57b6c5a91a08b4d52bd11ff37b29c43e28d7837d
 2018-06-06 15:22:52 -07:00
Tianjie Xu c8d9d6ca17 Merge "minui: Handle the failures from the drm backend in gr_init" 
am: 0e2d900739

Change-Id: I690e4ea0a8750dbabfbea8d4401df641d991bfd1
 2018-06-06 13:32:54 -07:00
Tao Bao 756c12404c Merge "ui: join only if joinable." am: 2454b2493a am: ccff03d196 
am: b4aad37e21

Change-Id: I13bc78cf0209b586181b00bc13f642a2e68c3e3d
 2018-06-06 13:17:39 -07:00
Tao Bao b4aad37e21 Merge "ui: join only if joinable." am: 2454b2493a 
am: ccff03d196

Change-Id: I6752eaf96637a9263eb49caa5322a815a6208ef5
 2018-06-06 11:07:02 -07:00
Tianjie Xu 0e2d900739 Merge "minui: Handle the failures from the drm backend in gr_init" 2018-06-06 17:53:20 +00:00
Tao Bao ccff03d196 Merge "ui: join only if joinable." 
am: 2454b2493a

Change-Id: I84d7bb6be8dbf35d0161237902a7b7e076200e10
 2018-06-06 10:08:15 -07:00
Tao Bao 2454b2493a Merge "ui: join only if joinable." 2018-06-06 16:41:52 +00:00
Tao Bao 94371fd012 ui: join only if joinable. 
The threads in RecoveryUI only get initialized if their Init()s finish
successfully.

Test: recovery_unit_test on marlin.
Change-Id: Ic4b62300a3cbd47887d9f4a90dc26f8a7deab616
 2018-06-06 07:49:47 -07:00
Tao Bao 69fdcf5bac Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 am: d770790a8f 
am: 34a7cdc8ce

Change-Id: I2b1b39d5bd47744d102b55736730348a94cede7e
 2018-06-05 23:29:38 -07:00
Tao Bao 34a7cdc8ce Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 
am: d770790a8f

Change-Id: Ia87e290bacfbad079e4aedf30a6f2c2c2ab13e9b
 2018-06-05 23:25:35 -07:00
Tao Bao d770790a8f Merge "tests: Specify the death test style to avoid flakiness." 
am: 878d5a77f0

Change-Id: Ia1cb4cea72323c80d605fdd9cedfa80d5e3145fb
 2018-06-05 23:21:32 -07:00
Tao Bao 878d5a77f0 Merge "tests: Specify the death test style to avoid flakiness." 2018-06-06 06:14:18 +00:00