Damien Bargiacchi
8568d7e558
Have gr_init_font alloc memory for the font
...
am: d00f5eb63a
Change-Id: Ic5394da1aff31adb7dda5160414a4831204fddc2
2016-09-13 15:50:25 +00:00
Tianjie Xu
707583a4ab
save uncrypt status to last_install am: e16e799dfd
...
am: 4769f209dc
Change-Id: Ic9056d4af518df3747743ec6b2886fa437029395
2016-09-13 01:50:40 +00:00
Tianjie Xu
4769f209dc
save uncrypt status to last_install
...
am: e16e799dfd
Change-Id: I0cac4258690c9ab6a6122a9e67c8453050aabcfc
2016-09-13 01:48:10 +00:00
Tianjie Xu
5a6e719176
Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10
...
am: 86ea1724ae -s ours
Change-Id: I5d55f4e63e1ec05e6bb612dd78e9caa731727843
2016-09-13 00:08:05 +00:00
Tianjie Xu
e16e799dfd
save uncrypt status to last_install
...
Save the uncrypt time cost to /cache/recovery/uncrypt_status. Recovery
reads the file and saves its contents to last_install.
Bug: 31383361
Test: Tested on angler and uncrypt_time reports correctly.
(cherry picked from commit fe16b5ccaf )
Change-Id: Id69681a35c7eb2f0eb21b48e3616dcda82ce41b8
2016-09-12 16:59:48 -07:00
Tianjie Xu
86ea1724ae
Merge "save uncrypt status to last_install" am: cdf509cce2
...
am: 6048138e10
Change-Id: I6fa2612bc1ea1fc706a5ded855c9296b4e794009
2016-09-12 23:03:58 +00:00
Tianjie Xu
6048138e10
Merge "save uncrypt status to last_install"
...
am: cdf509cce2
Change-Id: I4ef51a1d2c75f42c31f419e68ed616838a3f8ead
2016-09-12 23:01:28 +00:00
Tianjie Xu
cdf509cce2
Merge "save uncrypt status to last_install"
2016-09-12 22:56:31 +00:00
Tianjie Xu
fe16b5ccaf
save uncrypt status to last_install
...
Save the uncrypt time cost to /cache/recovery/uncrypt_status. Recovery
reads the file and saves its contents to last_install.
Bug: 31383361
Test: Tested on angler and uncrypt_time reports correctly.
Change-Id: I5cd3f7b6ca069d69086d09acfea8fc4f1215c833
Merged-In: I5cd3f7b6ca069d69086d09acfea8fc4f1215c833
2016-09-12 22:55:36 +00:00
Elliott Hughes
bd76bb0aa8
resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp
...
Change-Id: Ib1453d1bf3c6b83ef47a383d9d171b1059240477
2016-09-09 14:23:31 -07:00
Damien Bargiacchi
d00f5eb63a
Have gr_init_font alloc memory for the font
...
Change-Id: I8ccf369d52011bc5d07d8e041fe558ce734a78fc
2016-09-09 08:32:21 -07:00
Damien Bargiacchi
ad8b5a6c11
Remove duplicate thread loop
...
Fixes animation running at 2x speed
Change-Id: Ieec353097b6eee1cf40530e6f4f1e69927d2bc98
2016-09-09 08:22:49 -07:00
Damien Bargiacchi
a09b65adae
Remove debug log statement; fix build
...
am: 43d186021a
Change-Id: Iae1fedc578f243eddb9fa8ad9e86fd82f009a958
2016-09-08 00:19:56 +00:00
Damien Bargiacchi
43d186021a
Remove debug log statement; fix build
...
Change-Id: Ief92ec99d902ed58a48be9c2486cb99fdb184d7b
2016-09-07 17:11:07 -07:00
Damien Bargiacchi
49e2aeb353
Remove duplicate methods and variables from WearRecoveryUI
...
am: 5e7cfb9af6
Change-Id: I0f4dda0f92dcb6b3a230d2ad5d26f9855acb8c82
2016-09-07 23:38:24 +00:00
Damien Bargiacchi
5e7cfb9af6
Remove duplicate methods and variables from WearRecoveryUI
...
Copy pasta is never as delicious as ones hopes.
Also fix the Pike not rendering recovery bug.
Change-Id: I903da7da436e3347a22ff51633e8a0f28fea2c46
2016-09-07 02:26:50 -07:00
Tianjie Xu
ef674454a1
Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8
...
am: ec6a47ae46 -s ours
Change-Id: Ib30bcd792f0519dc92b56d90e19adfaa71ecb5b9
2016-09-01 23:33:29 +00:00
Tianjie Xu
ec6a47ae46
Merge "Switch recovery to libbase logging" am: 61590bbf0d
...
am: c5becf0ef8
Change-Id: I4c856d31d30173e2a97edbe3ecaa14cb7279c567
2016-09-01 23:14:58 +00:00
Tianjie Xu
c5becf0ef8
Merge "Switch recovery to libbase logging"
...
am: 61590bbf0d
Change-Id: I246ff0e75b0610abeedf21d3c3b1a9849a68856b
2016-09-01 23:12:01 +00:00
Tianjie Xu
61590bbf0d
Merge "Switch recovery to libbase logging"
2016-09-01 23:04:37 +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
7b0ad9c638
Switch recovery to libbase logging
...
Clean up the recovery image and switch to libbase logging.
Bug: 28191554
Change-Id: Icd999c3cc832f0639f204b5c36cea8afe303ad35
Merged-In: Icd999c3cc832f0639f204b5c36cea8afe303ad35
2016-09-01 18:33:25 +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
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
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
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
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
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
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
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