Commit Graph

9577 Commits

Author SHA1 Message Date
Tao Bao bfee61bf28 Duplicate the last_install content into last_log. am: f4885adc18
am: 87f4edf467

Change-Id: I7c28f25f07d0f1c1df41e771c28baaa813b0a44a
2016-09-27 01:45:12 +00:00
Tao Bao 5ac819a51f Merge "Duplicate the last_install content into last_log."
am: 95afc912fb

Change-Id: Ib3838e9d2f3d6a9a15872e9a5163bf140ff2f3d5
2016-09-27 01:43:42 +00:00
Tao Bao 87f4edf467 Duplicate the last_install content into last_log.
am: f4885adc18

Change-Id: I8f197d09af405254a0b07f0ace4e5149736ca0ad
2016-09-27 01:43:41 +00:00
Tao Bao 95afc912fb Merge "Duplicate the last_install content into last_log." 2016-09-27 01:38:53 +00:00
Tao Bao f889a4ecd6 Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp
am: e8d7b84a25

Change-Id: Ic9a32d066ce0abbb4e895624bc977d311fe2cdb5
2016-09-26 22:20:16 +00:00
Tao Bao 13414c6a04 Duplicate the last_install content into last_log.
am: badaac45fe

Change-Id: Iabe0a6f9530e671159e64dbacf455b57ac9eda32
2016-09-26 22:20:15 +00:00
Tao Bao e8d7b84a25 Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp 2016-09-26 22:07:00 +00:00
Tao Bao badaac45fe Duplicate the last_install content into last_log.
Currently we save the OTA metrics in last_install, which keeps the data
for the _last_ install only. This CL logs the same content into last_log
so that we keep the metrics for every install.

Bug: 31607469
Test: Apply an update (via OTA and sideload) and check last_log and last_install.

Change-Id: Id8f174d79534fddc9f06d72a4e69b2b1d8ab186c
(cherry picked from commit f4885adc18)
2016-09-26 14:56:25 -07:00
Tao Bao f4885adc18 Duplicate the last_install content into last_log.
Currently we save the OTA metrics in last_install, which keeps the data
for the _last_ install only. This CL logs the same content into last_log
so that we keep the metrics for every install.

Bug: 31607469
Test: Apply an update (via OTA and sideload) and check last_log and last_install.

Change-Id: Id8f174d79534fddc9f06d72a4e69b2b1d8ab186c
2016-09-26 14:46:12 -07:00
Elliott Hughes 91fb2816a4 resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp
am: 130f6c86f5

Change-Id: I78fc8627c3fc3701f1a34ae1038d96a7df2e6e18
2016-09-26 20:21:49 +00:00
Elliott Hughes 130f6c86f5 resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp
Change-Id: Ia041044547351a3e65b647bb9913aa18c7d2c97c
2016-09-26 12:53:52 -07:00
Elliott Hughes d5c7d6bffe Merge "Switch to <android-base/properties.h>." am: cc02f9652f
am: be9a94fd17

Change-Id: Ib5e4fb8d20e04df7b592af96d898afbbc6846620
2016-09-26 19:42:16 +00:00
Elliott Hughes be9a94fd17 Merge "Switch to <android-base/properties.h>."
am: cc02f9652f

Change-Id: I5f0d55f980055cee3c7ae477d1bdbd1d05b97dc1
2016-09-26 19:40:28 +00:00
Elliott Hughes cc02f9652f Merge "Switch to <android-base/properties.h>." 2016-09-26 19:32:48 +00:00
Matthew Bouyack 77c19899fb Fail gracefully when we fail to fork the update binary
am: c8db481780

Change-Id: I68691fb591b5819afe39e4792f9c26cc08eb87da
2016-09-26 18:02:33 +00:00
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