Commit Graph

2750 Commits

Author SHA1 Message Date
Bill Yi b83fb67663 Import translations. DO NOT MERGE am: 34e2854786 -s ours am: 93d2e08ef2 -s ours
am: 9fe8b8b663  -s ours

Change-Id: I07911aae8d7c9dbe1383072917ab52d314dfff20
2016-07-01 05:09:49 +00:00
Bill Yi 9fe8b8b663 Import translations. DO NOT MERGE am: 34e2854786 -s ours
am: 93d2e08ef2  -s ours

Change-Id: Icfba2b987aae40dd9f9cebfb7299cc5319d4bc68
2016-07-01 05:05:49 +00:00
Bill Yi 93d2e08ef2 Import translations. DO NOT MERGE
am: 34e2854786  -s ours

Change-Id: Ib1e3c37805d1457a00e84c4e0d11d2775714d7f6
2016-07-01 05:01:48 +00:00
Tao Bao 889517b80b updater: Fix the broken ReadFileFn. am: ccb0ba908a
am: 90a0dace8e

Change-Id: I292d3cb4febde3e3064ae205795492a85cdb7a3c
2016-07-01 02:32:55 +00:00
Tao Bao 90a0dace8e updater: Fix the broken ReadFileFn.
am: ccb0ba908a

Change-Id: I693ebeed98863b9ce06ca2704e05abe41ec2b5c2
2016-07-01 02:28:54 +00:00
Bill Yi 34e2854786 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: Ie1d01357ef53bd977da8188825dd744801ae58ad
2016-06-30 19:13:48 -07:00
Tao Bao ccb0ba908a updater: Fix the broken ReadFileFn.
Was accidentally broken by the CL in [1].

[1]: commit d6c93afcc2

Bug: 29767315
Change-Id: I851e13ccea6f5be6fcd47f712cc95867245f9934
(cherry picked from commit efacd80364)
2016-06-30 17:04:12 -07:00
Yabin Cui fb1dca351d resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp
am: 9b15ba8269

Change-Id: Idca52296ddcb318a23f1fb279435a1f71751afec
2016-06-30 22:55:19 +00:00
Yabin Cui 9b15ba8269 resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp
Change-Id: I889d94a723415ad2e660b8c99e66935142918bc4
2016-06-30 15:13:12 -07:00
Elliott Hughes 5f9d7749e9 Merge \\\\"Fix install.h\\\\'s use of attribute printf.\\\\" am: a82ee456bb am: 691db7ba77 am: 7c4a34195f
am: 937ca850ec

Change-Id: I4c496ee69e554f9616b5da98e3e708880060da0e
2016-06-30 18:32:29 +00:00
Elliott Hughes 937ca850ec Merge \\\"Fix install.h\\\'s use of attribute printf.\\\" am: a82ee456bb am: 691db7ba77
am: 7c4a34195f

Change-Id: I82d801da1ce7507efe6bb22edb39c28a17b168c0
2016-06-30 18:25:47 +00:00
Elliott Hughes 7c4a34195f Merge \\"Fix install.h\\'s use of attribute printf.\\" am: a82ee456bb
am: 691db7ba77

Change-Id: Ia5d26790412bc6d45fd73ec3c2e56b9ddbd37c06
2016-06-30 18:22:02 +00:00
Elliott Hughes 691db7ba77 Merge \"Fix install.h\'s use of attribute printf.\"
am: a82ee456bb

Change-Id: Ibcfabbb0e044d503f889f1afea271cf73ad93f45
2016-06-30 18:18:40 +00:00
Treehugger Robot a82ee456bb Merge "Fix install.h's use of attribute printf." 2016-06-30 18:04:38 +00:00
Yabin Cui 2f272c0551 Create bootloader_message static library.
bootloader_messages merges bootloader_message_writer
and bootloader.cpp, so we can use the same library to
manage bootloader_message in normal boot and recovery mode.

Bug: 29582118

Change-Id: I9efdf776ef8f02b53911ff43a518e035e0c29618
2016-06-30 11:02:38 -07:00
Elliott Hughes 83ce755518 Fix install.h's use of attribute printf.
And move off the bionic __nonnull macro, which I'm removing.

Change-Id: I40b4424f4fd7bd8076e0eee3ec35de36c3ded8de
2016-06-30 09:28:42 -07:00
Chih-Hung Hsieh 7a9ab5926f Merge \\\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\\" am: a9f648f010 am: 8e6e4bc979 am: a4cd854625
am: 34edfe173e

Change-Id: Ic8019b8497dce005caefd921b114749a5ec300a7
2016-06-29 23:21:08 +00:00
Chih-Hung Hsieh 34edfe173e Merge \\\"Fix google-explicit-constructor warnings in bootable/recovery.\\\" am: a9f648f010 am: 8e6e4bc979
am: a4cd854625

Change-Id: I9a96354f55fc2594826f9e54ae9567a02ee4bc95
2016-06-29 23:16:23 +00:00
Chih-Hung Hsieh a4cd854625 Merge \\"Fix google-explicit-constructor warnings in bootable/recovery.\\" am: a9f648f010
am: 8e6e4bc979

Change-Id: Ie8f8df0583cda672e8467c6ed8dadeee888342b8
2016-06-29 23:14:07 +00:00
Chih-Hung Hsieh 8e6e4bc979 Merge \"Fix google-explicit-constructor warnings in bootable/recovery.\"
am: a9f648f010

Change-Id: I7912c46384c2acef90fcd517d709449148f0b9db
2016-06-29 23:11:45 +00:00
Treehugger Robot a9f648f010 Merge "Fix google-explicit-constructor warnings in bootable/recovery." 2016-06-29 23:06:33 +00:00
Chih-Hung Hsieh c27098d467 Fix google-explicit-constructor warnings in bootable/recovery.
Bug: 28341362
Change-Id: I4c3ab0ad0f62f8f3a6f3b30771010533a2739381
Test: build with clang-tidy
2016-06-29 15:01:19 -07:00
Tianjie Xu 06eae1ecc1 Increase EIO retry count am: c37c5c3410 am: e5c6d47f52
am: 21b1a2a051

Change-Id: I4eb31e3957e33b6ecd9ed626f7a24d38178890ca
2016-06-24 00:31:36 +00:00
Tianjie Xu ad7366d48d Increase EIO retry count am: c37c5c3410 am: 6074099cb9
am: 3afc54c007

Change-Id: I79361b71429be13490c66fb037f9261adbed6ecf
2016-06-24 00:31:36 +00:00
Tianjie Xu 21b1a2a051 Increase EIO retry count am: c37c5c3410
am: e5c6d47f52

Change-Id: Idf3c00f5c8a3bea6993ebf888ebc22ee0097177d
2016-06-24 00:29:28 +00:00
Tianjie Xu 3afc54c007 Increase EIO retry count am: c37c5c3410
am: 6074099cb9

Change-Id: I8ca63b936530c156cb465fc1f0791253996b5fe2
2016-06-24 00:29:10 +00:00
Tianjie Xu 6074099cb9 Increase EIO retry count
am: c37c5c3410

Change-Id: I163541137bf8c421276383855d36ab127d2ddf95
2016-06-24 00:26:51 +00:00
Tianjie Xu e5c6d47f52 Increase EIO retry count
am: c37c5c3410

Change-Id: Idfc957d24e6f5efe32cf68dc696355c456ffde34
2016-06-24 00:26:36 +00:00
Tianjie Xu c37c5c3410 Increase EIO retry count
Increase the number of attempts of an OTA update from 3 to 5 in case
an I/O error happened. This should increase the success rate of the
update.

Bug: 29619468
Change-Id: I88a067d9debd55a07be22ed981f395f6e47ec28f
2016-06-23 17:15:25 -07:00
Yabin Cui 1e2ef0c3cb resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp
am: bf049bffe2

Change-Id: Ie5f358c52a894ed76a71c7684dee5350d7636c40
2016-06-21 18:14:35 +00:00
Yabin Cui bf049bffe2 resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp
Change-Id: I8788cc80473dc77bfa0cd2682f3acb6e17ac36df
2016-06-21 11:09:38 -07:00
Yabin Cui ed4c49c199 Merge "Verify wipe package when wiping A/B device in recovery." into nyc-mr1-dev 2016-06-21 17:10:49 +00:00
Yabin Cui 6faf0265c9 Verify wipe package when wiping A/B device in recovery.
To increase the security of wiping A/B devices, let uncrypt write
wipe package in misc partition. Then recovery verifies the wipe
package before wiping the device.

Bug: 29159185

Change-Id: I186691bab1928d3dc036bc5542abd64a81bc2168
2016-06-20 18:18:02 -07:00
Bill Yi e52210a6db Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 2c709ccef9 -s ours am: bf44cb7363 -s ours
am: 23af9abbc8  -s ours

Change-Id: I1e37deb000da296fbdde8add2d5ab3243bb3953a
2016-06-17 18:22:42 +00:00
Elliott Hughes 9cf2dd1a9b Merge \\\\"Minor minadbd cleanup.\\\\" am: a49c8a19da am: 98c97c8932 am: aaa7c08cfa
am: 62bd0a9cb1

Change-Id: I292fd31cebd3df14fedf83bc591a0a602bf40128
2016-06-17 18:22:42 +00:00
Bill Yi 23af9abbc8 Merge \\"Import translations. DO NOT MERGE\\" into stage-aosp-master am: 2c709ccef9 -s ours
am: bf44cb7363  -s ours

Change-Id: Idab1e4edff135cf0f426aa6150e30f612e43937b
2016-06-17 04:59:27 +00:00
Bill Yi bf44cb7363 Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 2c709ccef9  -s ours

Change-Id: I36aaa841cc349605f0c2403f650ce2bcfa8f7e53
2016-06-17 04:53:52 +00:00
Bill Yi 2c709ccef9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2016-06-17 04:43:47 +00:00
Elliott Hughes 62bd0a9cb1 Merge \\\"Minor minadbd cleanup.\\\" am: a49c8a19da am: 98c97c8932
am: aaa7c08cfa

Change-Id: I331002cbe7a01841600cfd2162772f9f343b4fdf
2016-06-17 04:19:26 +00:00
Elliott Hughes aaa7c08cfa Merge \\"Minor minadbd cleanup.\\" am: a49c8a19da
am: 98c97c8932

Change-Id: I416ad29724fa5975195ea55c17e4fe1e1495285f
2016-06-17 04:13:40 +00:00
Elliott Hughes 98c97c8932 Merge \"Minor minadbd cleanup.\"
am: a49c8a19da

Change-Id: Ie69f3c7d96292ad16f888fc63ee40bcd7c900a09
2016-06-17 04:10:37 +00:00
Treehugger Robot a49c8a19da Merge "Minor minadbd cleanup." 2016-06-17 04:02:39 +00:00
Elliott Hughes 24eb8a0643 Minor minadbd cleanup.
Distinguish our "services.cpp" more clearly from the regular adbd
"services.cpp", and remove a few useless includes of "sysdeps.h".

Change-Id: Ided4945a3ac5916133322ca7e95fa51add9abaa4
2016-06-16 19:57:20 -07:00
Bill Yi 1957b47349 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 29390361
Change-Id: I50fc8ab0611b65c43066331a7f9622a969d10080
2016-06-16 14:02:37 -07:00
Tianjie Xu 5475565761 Check the results from applypatch am: 31f8cc84cf am: 93110c767f
am: 51265b64a0

Change-Id: I43a63035dc106d70736a9d0aca85ec6e0cedffa4
2016-06-16 18:20:30 +00:00
Tianjie Xu 254b8d0a99 Check the results from applypatch am: 31f8cc84cf am: d0dcbddd31
am: 24488eb7db

Change-Id: I27ebbde5a6a013152b2595ff4bcd372b55afefee
2016-06-16 18:20:30 +00:00
Tianjie Xu 51265b64a0 Check the results from applypatch am: 31f8cc84cf
am: 93110c767f

Change-Id: I77be6c0fb2d26e5af1eef5cb3c14df20f964f7fa
2016-06-16 18:12:11 +00:00
Tianjie Xu 24488eb7db Check the results from applypatch am: 31f8cc84cf
am: d0dcbddd31

Change-Id: I00439aae8f79b0e2a5f7de6566110240492b526a
2016-06-16 18:11:47 +00:00
Tianjie Xu d0dcbddd31 Check the results from applypatch
am: 31f8cc84cf

Change-Id: Ie50652158b65d723346ffff18c85cbaab11820e1
2016-06-16 18:09:19 +00:00
Tianjie Xu 93110c767f Check the results from applypatch
am: 31f8cc84cf

Change-Id: I2ea241fb3e688f5f8b0558d638dd3ed502223f97
2016-06-16 18:08:59 +00:00