Elliott Hughes
cb22040c63
Switch to <android-base/properties.h>.
...
Bug: http://b/23102347
Test: boot into recovery.
Change-Id: Ib2ca560f1312961c21fbaa294bb068de19cb883e
Merged-In: Ib2ca560f1312961c21fbaa294bb068de19cb883e
2016-09-26 09:51:37 -07:00
Elliott Hughes
91e3aee9bd
Switch to <android-base/properties.h>.
...
Bug: http://b/23102347
Test: boot into recovery.
Change-Id: Ib2ca560f1312961c21fbaa294bb068de19cb883e
2016-09-23 18:16:35 -07:00
Matthew Bouyack
c8db481780
Fail gracefully when we fail to fork the update binary
...
This change was original made in cw-f-dev but caused failures in
nyc-mr1-dev-plus-aosp due to lack of support for 'LOGE'
This version of the change uses the new 'LOG(ERROR)' style logging
instead.
See bug b/31395655
Test: attempt a memory intensive incremental OTA on a low-memory device
Change-Id: Ia87d989a66b0ce3f48e862abf9b9d6943f70e554
2016-09-21 10:06:31 -07:00
Matthew Bouyack
3110715bb4
Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067"
...
am: 54881abb52 -s ours
Change-Id: I376f9d0d81dbe2304a7582fd3643307c0a19e3f7
2016-09-20 23:31:39 +00:00
Matthew Bouyack
54881abb52
Revert "DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067"
...
This reverts commit 78563fdf78 .
Change-Id: I1ea4956a9843130aa41f2f7bc011c72e64fd7b62
2016-09-20 22:57:19 +00:00
Matthew Bouyack
452907dc46
DO NOT MERGE Fail gracefully when we fail to fork the update binary am: de1b53d067
...
am: 78563fdf78 -s ours
Change-Id: I884f148f0c1e18281c4ed394b1b6be8e7a0a7f78
2016-09-20 22:12:18 +00:00
Matthew Bouyack
78563fdf78
DO NOT MERGE Fail gracefully when we fail to fork the update binary
...
am: de1b53d067
Change-Id: Ic7a42220ed7e842dad1d5d2aacdd12253bd5ad84
2016-09-20 21:24:51 +00:00
Matthew Bouyack
de1b53d067
DO NOT MERGE Fail gracefully when we fail to fork the update binary
...
See bug b/31395655
Change-Id: Ic5a046bc80ea88d7eb52755838bdbf4e1e47da50
2016-09-20 11:32:17 -07:00
Ethan Yonker
99af766668
Fix libcrypto dependency in 6.0 trees
...
Change-Id: Ie230ed5f3db38a62305e03e4f9819e4aca816e16
2016-09-15 14:57:39 -05:00
Tianjie Xu
b44690d9e6
Check corruption when reading uncrypt_status file am: 41a3fd4e20 am: 914f39d2d3
...
am: cc94f81436
Change-Id: I8e1df8a6483f6afdf6a2be4cadd7fcd0a3ba1bfc
2016-09-13 22:55:47 +00:00
Tianjie Xu
d467179eb6
Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6 am: 1d55666106
...
am: 8dd5b2a2cc
Change-Id: I0e82c7d7e914055df504a5293aedd49db47d9d22
2016-09-13 22:55:45 +00:00
Tianjie Xu
cc94f81436
Check corruption when reading uncrypt_status file am: 41a3fd4e20
...
am: 914f39d2d3
Change-Id: Ie8056fe4dfccfd44e740f6f3ba4621fbc8f5142b
2016-09-13 22:48:34 +00:00
Tianjie Xu
914f39d2d3
Check corruption when reading uncrypt_status file
...
am: 41a3fd4e20
Change-Id: I19d9b6605d75d636eef0c770979b9f71c2e6a7f2
2016-09-13 22:45:34 +00:00
Tianjie Xu
8dd5b2a2cc
Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 am: 40bae5e1c6
...
am: 1d55666106
Change-Id: I2081d6803377a7bf26175a55b3b5defb7c9d09d1
2016-09-13 22:31:33 +00:00
Tianjie Xu
1d55666106
Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9
...
am: 40bae5e1c6
Change-Id: I098148f53065e7420e500db66f1ada0d0730a0d6
2016-09-13 22:28:32 +00:00
Tianjie Xu
40bae5e1c6
Merge "Check corruption when reading uncrypt_status file"
...
am: 3cf815a6a9
Change-Id: Ic7404abd3026a8faffaac14a20c90ebf2ef10106
2016-09-13 22:26:03 +00:00
Treehugger Robot
3cf815a6a9
Merge "Check corruption when reading uncrypt_status file"
2016-09-13 22:20:04 +00:00
Tianjie Xu
41a3fd4e20
Check corruption when reading uncrypt_status file
...
Bug: 31383361
Change-Id: I0de920916da213528d73b742e4823b4a98c63ea1
(cherry picked from commit 1c1864f321 )
2016-09-13 14:04:55 -07:00
Tianjie Xu
1c1864f321
Check corruption when reading uncrypt_status file
...
Bug: 31383361
Change-Id: I0de920916da213528d73b742e4823b4a98c63ea1
2016-09-13 13:56:00 -07:00
Ethan Yonker
dcf2b674c4
Clean up PartitionSettings
...
The PartitionSettings struct contains some data elements that are duplicates
of data elements in the TWPartition class that is contained within the
PartitionsSettings.Part element. We will eliminate this duplication to help
reduce the chances for programming bugs.
Specifically, this fixes problems where the current file system does not
match the backed up file system.
Change-Id: I02f236e72093362050556a2e53a09d1dbb9a269d
2016-09-13 14:53:37 -05:00
Damien Bargiacchi
7010bf13f3
Merge "Have gr_init_font alloc memory for the font" into cw-f-dev am: 7a97733f7a
...
am: b3d92f0cf6
Change-Id: Ic1e4374330bfa376746574f0977bf0dfbb7937ab
2016-09-13 16:07:23 +00:00
Damien Bargiacchi
98462afa72
Have gr_init_font alloc memory for the font am: d00f5eb63a
...
am: 8568d7e558
Change-Id: I9a554afd7d8c9481d3273a5585e66bc9214f4592
2016-09-13 16:07:21 +00:00
Damien Bargiacchi
b3d92f0cf6
Merge "Have gr_init_font alloc memory for the font" into cw-f-dev
...
am: 7a97733f7a
Change-Id: I24e0dae51d531adf51d8727d42ac69dd37290a03
2016-09-13 15:52:36 +00:00
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
Damien Bargiacchi
7a97733f7a
Merge "Have gr_init_font alloc memory for the font" into cw-f-dev
2016-09-13 13:40:25 +00:00
Tianjie Xu
e8437b5340
save uncrypt status to last_install am: e16e799dfd am: 4769f209dc
...
am: 707583a4ab
Change-Id: I22b520ceaea408cad4e267d5a87c21ec80cd5e1d
2016-09-13 02:29:39 +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
6ba40d910d
Merge "save uncrypt status to last_install" am: cdf509cce2 am: 6048138e10 am: 86ea1724ae -s ours
...
am: 5a6e719176
Change-Id: Ic26c0844a97f25a809c3b413338caff3fa03d641
2016-09-13 00:15:05 +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
Ethan Yonker
ea2fcf0179
Fix compressed backups with split archives
...
Change-Id: I8b9197a18cd83c304e5d4ed29ef55ba67e4e42f7
2016-09-12 16:07:19 -05:00
Elliott Hughes
d87cd4ee62
resolve merge conflicts of ad8b5a6 to nyc-mr1-dev-plus-aosp
...
am: bd76bb0aa8
Change-Id: Iff135a00681ab237d81726f884ec6ba007703c9e
2016-09-09 23:39:35 +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
0430aa5b72
Remove debug log statement; fix build am: 43d186021a
...
am: a09b65adae
Change-Id: I77cb5b4d5262f236a237c5f82a92a7876a9dfccd
2016-09-08 00:22:26 +00: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
13c519396e
Remove duplicate methods and variables from WearRecoveryUI am: 5e7cfb9af6
...
am: 49e2aeb353
Change-Id: I208cec1dad19ae77fda54b17286ba8e115b262df
2016-09-07 23:40:53 +00: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
Ethan Yonker
724c5148a5
Fix restore of subpartitions
...
Change-Id: If76cd08cdac7e2af4e0f5f00d420eed1f30897d3
2016-09-01 18:40:26 -05:00
Tianjie Xu
3e0a5fa7a2
Merge "Switch recovery to libbase logging" am: 61590bbf0d am: c5becf0ef8 am: ec6a47ae46 -s ours
...
am: ef674454a1
Change-Id: I0eba33f1c585254315cdcf4bbad0a6e70d4c4024
2016-09-01 23:36:37 +00: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