Tianjie Xu
e397277ee9
Fix a typo of variable name in install.cpp
...
am: 073451ae21
Change-Id: I3ff8bcdac3829508e6a6887f237ce032ae761784
2016-09-01 22:10:59 +00:00
Tianjie Xu
1242a1cef8
Switch recovery to libbase logging
...
am: c21edd4654
Change-Id: I957b5e33274a3fdaf3ba83be28c8505dd07da1e2
2016-09-01 22:05:00 +00:00
Tianjie Xu
073451ae21
Fix a typo of variable name in install.cpp
...
Change-Id: I42057bc2fb5096ce009fe6e4b787bc9082cd572f
2016-09-01 22:00:17 +00:00
Tianjie Xu
c21edd4654
Switch recovery to libbase logging
...
Clean up the recovery image and switch to libbase logging.
Bug: 28191554
Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35
(cherry picked from commit 747781433f )
2016-09-01 14:32:55 -07:00
Tianjie Xu
e22805ef11
Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb am: 0ae9d80082
...
am: 28f6c43db5
Change-Id: I8fb1470e0f7e675c205bffe95c4fb9d0f202e4ed
2016-09-01 18:07:40 +00:00
Tianjie Xu
28f6c43db5
Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4 am: 852ae8d0fb
...
am: 0ae9d80082
Change-Id: Ia1fbd7e0352bb34a835e2e68593c464b555f41df
2016-09-01 18:01:09 +00:00
Tianjie Xu
0ae9d80082
Merge "Check an edge case when read(2) returns 0" am: 3202b8faf4
...
am: 852ae8d0fb
Change-Id: I1ff21b583748136119ee98137c13fa3ee7a0ecc7
2016-09-01 17:55:08 +00:00
Tianjie Xu
852ae8d0fb
Merge "Check an edge case when read(2) returns 0"
...
am: 3202b8faf4
Change-Id: I7d748b9f13c0f03f195f943cb3f5afa57c80296e
2016-09-01 17:52:10 +00:00
Treehugger Robot
3202b8faf4
Merge "Check an edge case when read(2) returns 0"
2016-09-01 17:48:39 +00:00
Tianjie Xu
747781433f
Switch recovery to libbase logging
...
Clean up the recovery image and switch to libbase logging.
Bug: 28191554
Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35
2016-09-01 17:43:14 +00:00
Tianjie Xu
71e182bc38
Check an edge case when read(2) returns 0
...
We might end up in an infinite loop if read(2) reached EOF unexpectedly.
The problematic code in uncrypt mentioned in the bug has been fixed
by switching to libbase ReadFully(). So I grepped through the recovery
code and fixed some other occurences of the issue.
Bug: 31073201
Change-Id: Ib867029158ba23363b8f85d61c25058a635c5a6b
2016-08-31 19:11:41 -07:00
Josh Gao
48019cf71a
Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3 am: a331d85806
...
am: 1d873510ff
Change-Id: Ibd3e787d8593b0a484ffa46ee5f7292828a9d128
2016-08-30 21:11:58 +00:00
Josh Gao
1d873510ff
Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d am: aad4cef0f3
...
am: a331d85806
Change-Id: Iff2e4199993338425af704dfb885e35884e2bf4f
2016-08-30 20:33:07 +00:00
Josh Gao
a331d85806
Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d
...
am: aad4cef0f3
Change-Id: I6ef1ef45fd598e12629a5bb5a28e9dca74e954fe
2016-08-30 20:30:37 +00:00
Josh Gao
aad4cef0f3
Merge "minadbd: rename adb_server_main to minadbd_main."
...
am: 818394869d
Change-Id: I7a8fe351a8bfa0b7bdc48c89d56647a98018af51
2016-08-30 20:27:39 +00:00
Josh Gao
818394869d
Merge "minadbd: rename adb_server_main to minadbd_main."
2016-08-30 20:17:27 +00:00
Josh Gao
acb2a2fa4c
minadbd: rename adb_server_main to minadbd_main.
...
adb_server_main in adb refers to the adb server on the host, not adbd.
Since there doesn't seem to be a good reason to reuse the declaration
from adb's headers, give minadbd a main function of its own.
Change-Id: I748f1a6822dc14c726cb73ef3b533c57a6615608
2016-08-30 13:15:12 -07:00
Chih-Hung Hsieh
37d76d0c88
Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 am: d987fe1d57
...
am: a50d7faff0
Change-Id: I6e1478dd95dae7491f6a6d5999b06469fa2a8d89
2016-08-27 00:08:19 +00:00
Chih-Hung Hsieh
a50d7faff0
Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86
...
am: d987fe1d57
Change-Id: Idd53009ad61bb4a0b573febdbedc5dc0eee8265f
2016-08-26 23:47:34 +00:00
Chih-Hung Hsieh
d987fe1d57
Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85
...
am: 9968866e86
Change-Id: Id888e91546d18d5ed0054e1fbac2823a6e31c6a1
2016-08-26 23:44:33 +00:00
Chih-Hung Hsieh
9968866e86
Merge "Fix clang-tidy warnings in bootable/recovery."
...
am: 89bf2bdc85
Change-Id: I7748981badcbcdfe24d0cbe1c41007c67f611b14
2016-08-26 23:42:05 +00:00
Treehugger Robot
89bf2bdc85
Merge "Fix clang-tidy warnings in bootable/recovery."
2016-08-26 23:29:23 +00:00
Chih-Hung Hsieh
8b23811d2a
Fix clang-tidy warnings in bootable/recovery.
...
* Use const reference type for read-only parameters.
Bug: 30407689
* Use faster overloaded string find function.
Bug: 30411878
* Add parentheses around macro parameters.
Bug: 28705665
Test: build with WITH_TIDY=1
Change-Id: I4e8e5748bfa4ae89871f1fb5fa4624d372530d75
2016-08-26 14:54:29 -07:00
Damien Bargiacchi
5afbbdd27a
Merge "Support use of custom fonts in miniui" into cw-f-dev am: 929ffefdcc
...
am: bdaee896a6
Change-Id: I723bcfb54cfc80d3b34707eff174f495e2374532
2016-08-24 21:06:36 +00:00
Damien Bargiacchi
aa7474aca4
Support use of custom fonts in miniui am: 35fff61b1c
...
am: e3c7184911
Change-Id: I92105784e928d69154d184aa9a514660405cc90f
2016-08-24 21:06:35 +00:00
Damien Bargiacchi
bdaee896a6
Merge "Support use of custom fonts in miniui" into cw-f-dev
...
am: 929ffefdcc
Change-Id: I5723771eb4d0716b120b7f682b47661a0ce48c67
2016-08-24 20:45:21 +00:00
Damien Bargiacchi
e3c7184911
Support use of custom fonts in miniui
...
am: 35fff61b1c
Change-Id: Iac50e95c15c0b4337435d47d3666c2aaf5eb203d
2016-08-24 20:45:14 +00:00
Damien Bargiacchi
929ffefdcc
Merge "Support use of custom fonts in miniui" into cw-f-dev
2016-08-24 20:36:36 +00:00
Damien Bargiacchi
35fff61b1c
Support use of custom fonts in miniui
...
Bug: 29547343
Change-Id: I398160c85daac90ffab2fa9bb2e96795b9e9885a
2016-08-18 19:51:45 -07:00
Tao Bao
9c30c29e70
resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp
...
am: 9de20d4a7c
Change-Id: Ib79151c746f36a056a8236fedf5afb1cdc0dfcce
2016-08-18 06:40:44 +00:00
Tao Bao
9de20d4a7c
resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp
...
Change-Id: I56d8af5552758dae44c1030c684448e621d226c5
2016-08-17 23:25:01 -07:00
Tao Bao
7f8dc846a3
Merge "Free mmaped area if keys fail to load" am: f599414aec
...
am: b3ddc0a4bf
Change-Id: I204d7fedd2f950da41c3a481231c459fc32d0056
2016-08-18 06:17:13 +00:00
Tao Bao
b3ddc0a4bf
Merge "Free mmaped area if keys fail to load"
...
am: f599414aec
Change-Id: Id96153c211ca1fcc1cd78d6e662b0b48795c0d76
2016-08-18 06:14:46 +00:00
Tao Bao
f599414aec
Merge "Free mmaped area if keys fail to load"
2016-08-18 06:10:35 +00:00
WiZarD
edafac6c7b
Free mmaped area if keys fail to load
...
Keys for package verification is loaded after the update
package is mmaped into memory. This mmaped area needs
to be freed when exiting the function.
Another approach would be to mmap after loading the keys.
Change-Id: Ib77711a8acd5c363b5517da12dc311fb8f9f4605
Signed-off-by: WiZarD <WiZarD.Devel@gmail.com >
2016-08-18 05:20:40 +00:00
Tianjie Xu
b580027c15
"view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc am: a44d4355ba
...
am: cc34bf13ef
Change-Id: Ic0243ec1db8713cf796b9a37f45a2ef1e5b5010a
2016-08-17 23:56:30 +00:00
Tianjie Xu
cc34bf13ef
"view recovery logs" will show /tmp/recovery.log am: 62ab2a0fbc
...
am: a44d4355ba
Change-Id: I0c3211372fb282da76fbcbcd6c56524fcfffa816
2016-08-17 23:43:20 +00:00
Tianjie Xu
a44d4355ba
"view recovery logs" will show /tmp/recovery.log
...
am: 62ab2a0fbc
Change-Id: I6acbbfd21b370df044413c4d15414b612b5654bb
2016-08-17 23:40:48 +00:00
Tianjie Xu
8b3336b2e6
Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5 am: e254b4e9e4
...
am: d93f541679
Change-Id: I4832afe30fb536bcb8cc043c5c04a2f521ac1136
2016-08-17 22:17:12 +00:00
Tianjie Xu
d93f541679
Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14 am: 4e4474c9c5
...
am: e254b4e9e4
Change-Id: Iedaed39a62f9756c0dc8122a40ea7db2c21f1c30
2016-08-17 22:13:12 +00:00
Tianjie Xu
e254b4e9e4
Merge ""view recovery logs" will show /tmp/recovery.log" am: c158cf0a14
...
am: 4e4474c9c5
Change-Id: Iaca861be960a271c09c07deeaf4f98850edc4f71
2016-08-17 22:10:12 +00:00
Tianjie Xu
62ab2a0fbc
"view recovery logs" will show /tmp/recovery.log
...
For A/B devices, "view recovery logs" doesn't work due to the lack
of cache partition. To help debugging, we'll show /tmp/recovery.log
instead if /cache is not found.
Change-Id: Idb77c3a4c30388148a210b38d732a7b27e757bba
Test: Tested on an A/B device and /tmp/recovery.log showed up.
Bug: 30905700
(cherry picked from commit a54f75ede8 )
2016-08-17 15:07:50 -07:00
Tianjie Xu
4e4474c9c5
Merge ""view recovery logs" will show /tmp/recovery.log"
...
am: c158cf0a14
Change-Id: I1485c1c84a7caa20b11da4fd2561e0dba95fc39b
2016-08-17 22:07:44 +00:00
Tianjie Xu
c158cf0a14
Merge ""view recovery logs" will show /tmp/recovery.log"
2016-08-17 22:05:16 +00:00
Tianjie Xu
a54f75ede8
"view recovery logs" will show /tmp/recovery.log
...
For A/B devices, "view recovery logs" doesn't work due to the lack
of cache partition. To help debugging, we'll show /tmp/recovery.log
instead if /cache is not found.
Change-Id: Idb77c3a4c30388148a210b38d732a7b27e757bba
Test: Tested on an A/B device and /tmp/recovery.log showed up.
Bug: 30905700
2016-08-17 12:35:22 -07:00
Johan Harvyl
bebe94b105
Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d am: d7865e81f1
...
am: 63e4cc1d16
Change-Id: Ib6533e78255613f4b608aa976cd3221a998b0644
2016-08-15 18:16:06 +00:00
Johan Harvyl
63e4cc1d16
Merge "Format formattable partitions if mount fails" am: cb76857147 am: 2f5cfdbb9d
...
am: d7865e81f1
Change-Id: I391ec86730d409d0d6c51e003d57f4f3f0a4a3e3
2016-08-15 18:12:05 +00:00
Johan Harvyl
d7865e81f1
Merge "Format formattable partitions if mount fails" am: cb76857147
...
am: 2f5cfdbb9d
Change-Id: I7c0848776028caf766f33895a010349ccabf13bf
2016-08-15 18:07:35 +00:00
Johan Harvyl
2f5cfdbb9d
Merge "Format formattable partitions if mount fails"
...
am: cb76857147
Change-Id: I50c2045f56693e445922d30af72867e7ac55b61f
2016-08-15 18:03:37 +00:00
Treehugger Robot
cb76857147
Merge "Format formattable partitions if mount fails"
2016-08-15 17:53:54 +00:00