Tianjie Xu
9da825940d
Resolve merge conflicts of 286848e
to stage-aosp-master
...
Change-Id: I3bfe781a215e09ebe162af8522972976c110410f
2016-07-27 19:39:43 -07:00
Tianjie Xu
286848e754
Merge "Update background text images under recovery"
2016-07-28 01:44:59 +00:00
Tianjie Xu
b7394cdd34
Update background text images under recovery
...
Update the text images according to the new translations of
"b+sr+Latn", "be-rBY", and "bs-rBA". Also switch to pngquant
which gives a better compression rate.
Bug: 30415666
Change-Id: I6eae5dd7be4c7f1f93c50113822caac9868e0f95
2016-07-28 01:41:55 +00:00
Chih-Hung Hsieh
977903da49
Merge \"Fix clang-tidy performance warnings.\"
...
am: 2a3b695168
Change-Id: I55cadf517ec612f1b03de71ce7ca5cff69bc80d0
2016-07-27 20:49:34 +00:00
Chih-hung Hsieh
2a3b695168
Merge "Fix clang-tidy performance warnings."
2016-07-27 20:40:39 +00:00
Chih-Hung Hsieh
23abfd37a5
Fix clang-tidy performance warnings.
...
* Use const reference parameter type to avoid unnecessary copy.
* Use more efficient overloaded string methods.
Bug: 30407689
Bug: 30411878
Change-Id: Iefab05c077367f272abf545036b853e8a295c8cd
Test: build with WITH_TIDY=1
2016-07-27 10:19:47 -07: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
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
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
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
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
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
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
93110c767f
Check the results from applypatch
...
am: 31f8cc84cf
Change-Id: I2ea241fb3e688f5f8b0558d638dd3ed502223f97
2016-06-16 18:08:59 +00:00
Tao Bao
28a425aa1f
tests: Remove obsolete MTD support.
...
am: 7eb60efa8d
Change-Id: I87843f8c1b99aa3c5c64ff46f7ab86fde6a5e25a
2016-06-16 16:39:33 +00:00
Tao Bao
7eb60efa8d
tests: Remove obsolete MTD support.
...
Track the change in commit 63a319201f
and
fix builds.
Bug: http://b/29250988
Change-Id: Iad5be953e102020931649629afc980d585ed2931
(cherry picked from commit ab2fb94bf4
)
2016-06-16 16:19:46 +00:00
Tao Bao
ab2fb94bf4
tests: Remove obsolete MTD support.
...
Track the change in commit 63a319201f
and
fix builds.
Bug: http://b/29250988
Change-Id: Iad5be953e102020931649629afc980d585ed2931
2016-06-15 21:18:13 -07:00
Tianjie Xu
31f8cc84cf
Check the results from applypatch
...
Check the results from applypatch in PerformCommandDiff; and abort the
update on failure.
Bug:29339536
Change-Id: I5087d79ba532b54250f4c17560524255c8a4fabc
2016-06-15 23:26:59 +00:00
Elliott Hughes
d71cf2eee3
Merge \\"Remove an abused global so we can actually see logging.\\" am: 37450d7f42
...
am: 4692e5d8c8
Change-Id: Idf78bf71a0670997da754d0de93691db313aed57
2016-06-15 23:18:43 +00:00
Elliott Hughes
a087302da7
Merge \\"init now uses libprocessgroup, so set up /acct.\\" am: 279876c932
...
am: c58d7dda8c
Change-Id: I8398a7b4b95979d6502545dcfd931a5ce0d28069
2016-06-15 23:18:42 +00:00
Elliott Hughes
4692e5d8c8
Merge \"Remove an abused global so we can actually see logging.\"
...
am: 37450d7f42
Change-Id: Id9c78be08f2822ec92d54ba11693d3e5adb7b5aa
2016-06-15 23:16:14 +00:00
Elliott Hughes
c58d7dda8c
Merge \"init now uses libprocessgroup, so set up /acct.\"
...
am: 279876c932
Change-Id: I32a89d5d0b41311775dacea1f7d44fe1f6654d2d
2016-06-15 23:16:13 +00:00
Treehugger Robot
37450d7f42
Merge "Remove an abused global so we can actually see logging."
2016-06-15 23:10:32 +00:00
Elliott Hughes
279876c932
Merge "init now uses libprocessgroup, so set up /acct."
2016-06-15 23:09:19 +00:00
Elliott Hughes
eaddde6888
resolve merge conflicts of 179c0d8
to stage-aosp-master
...
am: 274d17dc0f
Change-Id: I356adf332d5749a6d3f3e29b99bf3fca35de349a
2016-06-15 22:28:05 +00:00
Elliott Hughes
274d17dc0f
resolve merge conflicts of 179c0d8
to stage-aosp-master
...
Change-Id: Iba5aec266444cabf83f600f2bdb45a3c027e5995
2016-06-15 15:22:17 -07:00
Elliott Hughes
48ebb07211
init now uses libprocessgroup, so set up /acct.
...
Change-Id: Iec1492dfaf2ceae6f4d8618dd725d07316ee960b
2016-06-15 15:15:15 -07:00
Elliott Hughes
59bf0da22f
Remove an abused global so we can actually see logging.
...
Change-Id: Ib97440bc0542003b84c45cb05f194ba20104dad6
2016-06-15 15:14:04 -07:00
Elliott Hughes
179c0d80bc
Merge "Remove obsolete MTD support."
2016-06-15 21:55:15 +00:00
Tao Bao
2fc7cd69fd
Merge \\"Add bootloader_message_ab struct.\\" am: 59f04b9982
...
am: f57d7f02c9
Change-Id: Ie2407db5b16f90cbd07ada2d96441aba4055e6c9
2016-06-14 16:22:55 +00:00
Tao Bao
f57d7f02c9
Merge \"Add bootloader_message_ab struct.\"
...
am: 59f04b9982
Change-Id: I9c3a816243a03dc2723679ef6efa241361446b96
2016-06-14 16:18:22 +00:00
Tao Bao
59f04b9982
Merge "Add bootloader_message_ab struct."
2016-06-14 16:09:16 +00:00
Tao Bao
38afad46d8
resolve merge conflicts of 490fad6
to nyc-dev-plus-aosp
...
Change-Id: I299fe15977c1a59d0c784728872c3a7f63c95e56
2016-06-13 19:12:46 -07:00
Tao Bao
490fad6791
applypatch: Don't call inflate() when it expects zero-length output.
...
We may have expanded_len == 0 when calling inflate(). After switching to
using std::vector, it passes a nullptr buffer to inflate() and leads to
Z_STREAM_ERROR.
Bug: 29312140
Change-Id: Iab7c6c07a9e8488e844e7cdda76d02bd60d2ea98
2016-06-13 16:42:52 -07:00
Tao Bao
1e67422f37
Merge \\"updater: Fix the broken ReadFileFn.\\" am: 4ddd5edf31
...
am: 89dfe730d4
Change-Id: Ia465c92d341da4681d3490151a20e1e117271e52
2016-06-11 18:53:14 +00:00
Tao Bao
89dfe730d4
Merge \"updater: Fix the broken ReadFileFn.\"
...
am: 4ddd5edf31
Change-Id: Id73ccb86a3869198baf84b7978054b174c281c79
2016-06-11 18:49:21 +00:00
Tao Bao
4ddd5edf31
Merge "updater: Fix the broken ReadFileFn."
2016-06-11 18:42:53 +00:00
Tao Bao
efacd80364
updater: Fix the broken ReadFileFn.
...
Was accidentally broken by the CL in [1].
[1]: commit d6c93afcc2
Change-Id: I851e13ccea6f5be6fcd47f712cc95867245f9934
2016-06-11 03:59:56 -07:00
Elliott Hughes
63a319201f
Remove obsolete MTD support.
...
Bug: http://b/29250988
Change-Id: Ia97ba9082a165c37f74d6e1c3f71a367adc59945
2016-06-10 13:45:35 -07:00
Tianjie Xu
9d2657fbb7
Log source/target build version to last_install
...
am: b0ddae55e5
Change-Id: Ifd9e006588de8bea233a4e90a5c80ed6b894054a
2016-06-10 17:21:40 +00:00
Elliott Hughes
21c4f4e6e6
Merge \\"Remove etc/META-INF/com/google/android/update-script.\\" am: 5b2191a9d6
...
am: 5be6ae12b5
Change-Id: Ia2aace34275d4ef517b0bf47a8c9ae04f47a3f05
2016-06-10 16:30:34 +00:00