Commit Graph

5462 Commits

Author SHA1 Message Date
Tianjie Xu 490a10b818 Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57 am: 4609778204
am: f12aebda91

Change-Id: Iff9efe919a6657d1c7eed083c8708a958ab997b0
2017-10-20 23:13:54 +00:00
Tianjie Xu f12aebda91 Merge "Finish the new data receiver when update fails" am: 9831ef389b am: 85fca1fc57
am: 4609778204

Change-Id: I2b82e90d2adc859fa6781c7ff82dcfed1bd15b91
2017-10-20 22:20:49 +00:00
Tianjie Xu 4609778204 Merge "Finish the new data receiver when update fails" am: 9831ef389b
am: 85fca1fc57

Change-Id: I0ff54e132aceb96305182daeaf77a79491ba412b
2017-10-20 21:37:28 +00:00
Tianjie Xu 85fca1fc57 Merge "Finish the new data receiver when update fails"
am: 9831ef389b

Change-Id: I62be2406eede1f9e02ee4ca45ffca6fd2283ef0a
2017-10-20 21:11:20 +00:00
Tianjie Xu 9831ef389b Merge "Finish the new data receiver when update fails" 2017-10-20 21:01:48 +00:00
Tianjie Xu 5450c84ba4 Finish the new data receiver when update fails
The thread to receive new data may still be alive after we exit
PerformBlockImageUpdate() upon failures. This caused memory corruption
when we run the unittest repeatedly. Set the receiver_available flag
to false and make sure the receiver exits when the update fails.

Bug: 65430057
Test: unittests passed with tsan
Change-Id: Icb232d13fb96c78262249ffbd29cdbe5b77f1fce
2017-10-20 11:14:56 -07:00
Bill Yi 661fa2450d Import translations. DO NOT MERGE am: 9bc56553dd -s ours am: 63405d5d1c -s ours
am: 684d255b11  -s ours

Change-Id: Ib46540b810ba2337106b5548337ce7cb6fe77a82
2017-10-20 15:53:54 +00:00
Bill Yi 684d255b11 Import translations. DO NOT MERGE am: 9bc56553dd -s ours
am: 63405d5d1c  -s ours

Change-Id: I9a11da2bbf5de6f7601d74cbde3bc67b81399452
2017-10-20 15:41:53 +00:00
Bill Yi 63405d5d1c Import translations. DO NOT MERGE
am: 9bc56553dd  -s ours

Change-Id: Icbd59fbdd4a239a57bedbf6e36fea4eb30364622
2017-10-20 15:33:23 +00:00
Bill Yi 9bc56553dd Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Iae8fc3afc1453b6b609dae2bbff08231d00735e7
2017-10-20 01:50:04 -07:00
Tao Bao a6f341ebed Merge "rotate_logs: Clean up the header includes." am: 30ec005104 am: c8eba4a036 am: 41763a5dbb
am: 04bcf3ee76

Change-Id: I3c97a13dd949fe425e83dbf3f39306ba35d0b1d1
2017-10-18 20:40:49 +00:00
Tao Bao 04bcf3ee76 Merge "rotate_logs: Clean up the header includes." am: 30ec005104 am: c8eba4a036
am: 41763a5dbb

Change-Id: I257ece1d0df06c45faac1501c8cc3c13da43a3db
2017-10-18 20:38:58 +00:00
Tao Bao 41763a5dbb Merge "rotate_logs: Clean up the header includes." am: 30ec005104
am: c8eba4a036

Change-Id: Ibac286ecec3c31a8aa6d1fb4cf47428c39549632
2017-10-18 20:31:56 +00:00
Tao Bao c8eba4a036 Merge "rotate_logs: Clean up the header includes."
am: 30ec005104

Change-Id: Icc10e4b6715a78deb6aab73829efa336821f849d
2017-10-18 20:27:57 +00:00
Tao Bao 30ec005104 Merge "rotate_logs: Clean up the header includes." 2017-10-18 20:21:36 +00:00
Tao Bao 245c522588 rotate_logs: Clean up the header includes.
Also clang-format rotate_logs.cpp to get consistent style.

Test: mmma bootable/recovery
Test: recovery_manual_test works on marlin.
Change-Id: I1210a346b97bbf0e1a8c3f8e3e73a7c114858ca8
2017-10-18 11:08:37 -07:00
Tao Bao 01395b0949 Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 am: f63dbde3ef am: 6f4f528419
am: 2a9dbb4063

Change-Id: I41d48f22966f1596acc5baa283b79d20cdb78151
2017-10-17 16:12:44 +00:00
Tao Bao 2a9dbb4063 Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8 am: f63dbde3ef
am: 6f4f528419

Change-Id: Id88582449fe3f1cf49931b6ea3d640c3308d92cb
2017-10-17 16:10:13 +00:00
Tao Bao 6f4f528419 Merge "otautil: Move RangeSet implementation into rangeset.cpp." am: bab1e8efc8
am: f63dbde3ef

Change-Id: Ie550fbbdf20a3f0e7d23038b5841f842812ade7a
2017-10-17 16:06:11 +00:00
Tao Bao f63dbde3ef Merge "otautil: Move RangeSet implementation into rangeset.cpp."
am: bab1e8efc8

Change-Id: I5d41bdfe514e09c49bf2279ee6ca1b56ff5aab1f
2017-10-17 16:04:13 +00:00
Tao Bao bab1e8efc8 Merge "otautil: Move RangeSet implementation into rangeset.cpp." 2017-10-17 16:01:50 +00:00
Tao Bao 4568582002 otautil: Move RangeSet implementation into rangeset.cpp.
Since it has grown much larger, users of the header shouldn't compile
and carry their full copies.

Also add missing header includes in imgdiff.cpp and imgdiff_test.cpp.

Test: mmma bootable/recovery
Test: recovery_unit_test; recovery_component_test; recovery_host_test
Change-Id: I88ca54171765e5606ab0d61580fbc1ada578fd7d
2017-10-16 11:28:18 -07:00
Chih-hung Hsieh a68bef7cd6 Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a am: bb971cce89
am: 111469726c

Change-Id: I02b09b0bb3d161aa3c18eba73d95d6c33c17b4d4
2017-10-12 18:42:26 +00:00
Chih-hung Hsieh 111469726c Merge "Fix owner email address." am: b4a8c6abd9 am: 97d9ae086a
am: bb971cce89

Change-Id: I8afed0f0c58cacf92ee2acaf0a6d177061f9e323
2017-10-12 18:38:56 +00:00
Chih-hung Hsieh bb971cce89 Merge "Fix owner email address." am: b4a8c6abd9
am: 97d9ae086a

Change-Id: Id31b7ab0a26130ce495aa061a109aa9280a771f2
2017-10-12 18:29:03 +00:00
Chih-hung Hsieh 97d9ae086a Merge "Fix owner email address."
am: b4a8c6abd9

Change-Id: Ia637ddf881edb5db4b172d1ab2f75f321aee4c2a
2017-10-12 18:22:56 +00:00
Chih-hung Hsieh b4a8c6abd9 Merge "Fix owner email address." 2017-10-12 18:10:12 +00:00
Chih-Hung Hsieh 4945407f5b Fix owner email address.
Test: normal build.
Bug: 67718313
Change-Id: Ia3144c634647f7a457810370a9f7275c19a8aa76
2017-10-12 10:45:04 -07:00
Tao Bao f263a92016 Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255c am: cc11f66cfd
am: 309031e02d

Change-Id: Id7b4659a9d82cf58118915f678e9e0dd6ab8eea4
2017-10-12 16:29:58 +00:00
Tao Bao 309031e02d Merge "applypatch: Move to Soong." am: b058c5c481 am: 7722d8255c
am: cc11f66cfd

Change-Id: I5530a2adf2526cb689e91539579717568783243e
2017-10-12 16:28:22 +00:00
Tao Bao cc11f66cfd Merge "applypatch: Move to Soong." am: b058c5c481
am: 7722d8255c

Change-Id: Ie98b90295ccf607c8e5b71401dce190fdfa05ce0
2017-10-12 16:24:44 +00:00
Tao Bao 7722d8255c Merge "applypatch: Move to Soong."
am: b058c5c481

Change-Id: Ibdee21116b15742ff8688352c6d49195a516132d
2017-10-12 16:20:51 +00:00
Tao Bao b058c5c481 Merge "applypatch: Move to Soong." 2017-10-12 16:12:48 +00:00
Tao Bao 7e029737b3 Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94 am: a7b8be564a
am: 4ffbf43de3

Change-Id: Ib67360b5516e2f7cf25b4e4dda36acd11f27a26c
2017-10-12 03:40:39 +00:00
Tao Bao 07ba5b7813 Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73dea am: 44ddef71dc
am: 1431cbec0b

Change-Id: I56b3780eec24417b68207ee584aa45562021b9af
2017-10-12 03:38:00 +00:00
Tao Bao 4ffbf43de3 Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94
am: a7b8be564a

Change-Id: I2d43ffe9e69b75907c8b3846f1d56cf1bf6cc0a6
2017-10-12 03:35:43 +00:00
Tao Bao 1431cbec0b Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73dea
am: 44ddef71dc

Change-Id: If29463d5b5b15405dbcb90554b756e4633f7f6eb
2017-10-12 03:35:20 +00:00
Tao Bao a7b8be564a Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff
am: 92964b3b94

Change-Id: I21dcd0e8dc0020a7b45a85b53072284fe97c3f55
2017-10-12 03:32:11 +00:00
Tao Bao 44ddef71dc Merge "Drop -Wno-unused-parameter." am: a0e9742796
am: 6cadc73dea

Change-Id: Ib9bb6362481315466c12575b62900bf61747eafc
2017-10-12 03:31:29 +00:00
Tao Bao 92964b3b94 Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS."
am: 2ebc7dabff

Change-Id: I215fe78600a7799ca8be5ac479e50d1f00d70238
2017-10-12 03:27:23 +00:00
Tao Bao 6cadc73dea Merge "Drop -Wno-unused-parameter."
am: a0e9742796

Change-Id: Iabe3bf5471a02d3d3af64f6d249fd761bc7ac512
2017-10-12 03:26:41 +00:00
Tao Bao 2ebc7dabff Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." 2017-10-12 03:22:41 +00:00
Tao Bao a0e9742796 Merge "Drop -Wno-unused-parameter." 2017-10-12 03:22:17 +00:00
Dan Albert 487a6a2ccd Merge "Add missing includes." am: 3c4e270123 am: b23cfd43da am: 57caa90f74
am: 304fe6c927

Change-Id: I2f7064f278cd60826bfd304def70aa547a929c80
2017-10-12 00:46:16 +00:00
Dan Albert 304fe6c927 Merge "Add missing includes." am: 3c4e270123 am: b23cfd43da
am: 57caa90f74

Change-Id: I87c9b84c63806449f3614b95402d62bc617e1c09
2017-10-12 00:37:03 +00:00
Dan Albert 57caa90f74 Merge "Add missing includes." am: 3c4e270123
am: b23cfd43da

Change-Id: I4c50eea579d610c5590ecfaace70f2761038204a
2017-10-12 00:22:57 +00:00
Dan Albert b23cfd43da Merge "Add missing includes."
am: 3c4e270123

Change-Id: I137b0abf7f9b72e458ff62b203dfb92bca58c97e
2017-10-12 00:21:26 +00:00
Treehugger Robot 3c4e270123 Merge "Add missing includes." 2017-10-12 00:11:56 +00:00
Tao Bao 99f0d9e52b Drop -Wno-unused-parameter.
The only one left is libedify. Will handle that in a separate CL.

Test: mmma bootable/recovery
Change-Id: I732a5f85229da90fd767bee2e46c5c95f529c396
2017-10-11 16:56:12 -07:00
Tao Bao 582b67850f applypatch: Move to Soong.
Test: mmma bootable/recovery
Change-Id: Ie163aff1c4c2b3b15bb705825779ada6bc38ad67
2017-10-11 16:26:06 -07:00