Bill Yi
8281767f34
Import translations. DO NOT MERGE
...
am: e49c0d6406 -s ours
Change-Id: I63088d0308aacfce14c75c7508bb04e587014217
2016-07-21 03:59:12 +00:00
Bill Yi
e49c0d6406
Import translations. DO NOT MERGE
...
Change-Id: If24c94c20f8e4c37c119dcaff765e9ee59e48ef4
Auto-generated-cl: translation import
2016-07-20 19:24:24 -07:00
Tianjie Xu
831c3e2ac1
Skip update verification if care_map is not found
...
am: da654af606
Change-Id: I67af9ecde49f72cbf4044ac1d5a9e10b911e8a93
2016-07-16 00:16:37 +00:00
Tianjie Xu
da654af606
Skip update verification if care_map is not found
...
Recently flashed devices may not have care_map.txt in /data/ota_package.
This leads to a failure of update-verifier and prevents boot
success flag from being set. So, we need to skip verification
in case the file is not found.
Error message:
... I update_verifier: Started with arg 1: nonencrypted
... I update_verifier: Booting slot 1: isSlotMarkedSuccessful=0
... E update_verifier: Care map /data/ota_package/care_map.txt not found.
... E update_verifier: Failed to verify all blocks in care map file
Bug: 30156449
Change-Id: Ia15f5f3e7ca2ea6981d49678e799b9f70d134faa
2016-07-15 16:30:12 -07:00
Tianjie Xu
fe6014ecca
Fix a typo when comparing the verity mode
...
am: 4bbe0c93c8
Change-Id: I734ac0c1124e2459bb64defe16386ee1ee1c534f
2016-07-15 00:07:03 +00:00
Tianjie Xu
4bbe0c93c8
Fix a typo when comparing the verity mode
...
The veritymode string used by the bootloader should be lowercase 'eio'
instead of 'EIO'. Fix the typo and change to strcasecmp.
Bug: 27175949
Change-Id: I376dacc70eef7364e2b9931a7c940adedcdb1929
2016-07-14 23:57:43 +00:00
Tianjie Xu
6c0a2dec21
Merge \"Touch blocks in care_map in update_verifier\" into nyc-mr1-dev
...
am: 13f44939b1
Change-Id: I217e2883e45979b8cbdd7f0ce138d4b66f2e2b5d
2016-07-14 22:43:13 +00:00
Tianjie Xu
13f44939b1
Merge "Touch blocks in care_map in update_verifier" into nyc-mr1-dev
2016-07-14 22:27:09 +00:00
Tianjie Xu
03ca853a1c
Touch blocks in care_map in update_verifier
...
Read all blocks in system and vendor partition during boot time
so that dm-verity could verify this partition is properly flashed.
Bug: 27175949
Change-Id: I38ff7b18ee4f2733e639b89633d36f5ed551c989
2016-07-14 14:31:39 -07:00
Tianjie Xu
7831762308
Skip update-on-boot for bootreason in blacklist
...
am: 27b9fc8a36
Change-Id: Icb5c2cfb2430e767f81506b20912f52d74d719d5
2016-07-13 00:41:01 +00:00
Tianjie Xu
27b9fc8a36
Skip update-on-boot for bootreason in blacklist
...
Skip the OTA installation when bootreason is 'kernel_panic',
'Panic' etc.
Change-Id: Ic1202492bffefa1a9d8d0e691b5af979285e552c
Test: On angler, ota installation skips for one bootreason in the blacklist.
Bug: 29978689
2016-07-11 18:37:34 -07:00
Elliott Hughes
b0728a3c2a
Support landscape layouts.
...
am: 6d089a955f
Change-Id: Iebdce4fe859984257cef027ec6de1aeae51b8d69
2016-07-09 04:29:18 +00:00
Elliott Hughes
6d089a955f
Support landscape layouts.
...
Add support for landscape layouts to the existing portrait support.
Bug: http://b/29418855
Test: tested manually with "Run graphics test" on flounder/fugu/ryu.
Change-Id: Ib4a62bf5f2b8a1cef6028a01f05145104660560a
2016-07-08 18:21:45 -07:00
Yabin Cui
159ca9b0ac
Fix bootloader_message.
...
am: 9da04d595f
Change-Id: I684c6afa25ce1dccad06920eee8a3bd6b7da96b1
2016-07-06 21:17:53 +00:00
Yabin Cui
9da04d595f
Fix bootloader_message.
...
Bug: 29945717
Change-Id: I934fd6c52b0111937fa75455de2fa4157fb30f6f
2016-07-06 11:47:23 -07: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
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
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
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
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
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
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
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
51265b64a0
Check the results from applypatch am: 31f8cc84cf
...
am: 93110c767f
Change-Id: I77be6c0fb2d26e5af1eef5cb3c14df20f964f7fa
2016-06-16 18:12:11 +00:00