Commit Graph

2367 Commits

Author SHA1 Message Date
Matt Sarett 8a55c65345 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1 am: b02b2fe392
am: 75dea9ca3a

* commit '75dea9ca3aabe23bed2d9f15b70dbdd5efb18cd1':
  DO NOT MERGE Use updated libpng API

Change-Id: Id23a9528e6413e40cd3249e0143c02798dcec4cc
2016-05-19 23:28:21 +00:00
Matt Sarett 75dea9ca3a resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d am: fc1d9a49d1
am: b02b2fe392

* commit 'b02b2fe392827a423c7783522edc5b9ad3d4f130':
  DO NOT MERGE Use updated libpng API

Change-Id: Ie6e8c5118687f0d34fc4acffdcb1d784e71e411f
2016-05-19 23:25:43 +00:00
Matt Sarett b02b2fe392 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55 am: 300af0779d
am: fc1d9a49d1

* commit 'fc1d9a49d1e33c133c96cf6b04d6f47d3cfaa496':
  DO NOT MERGE Use updated libpng API

Change-Id: Id9da4d3980f394bf19032581629d0baf9c30e0fc
2016-05-19 23:22:55 +00:00
Matt Sarett fc1d9a49d1 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad am: aa02888e55
am: 300af0779d

* commit '300af0779de3c2658f32e3de40adc41dae92df1e':
  DO NOT MERGE Use updated libpng API

Change-Id: Iac60caa51e747fcde2c08ddf06323e8b1e98f36a
2016-05-19 23:20:22 +00:00
Matt Sarett 300af0779d resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27 am: 8a1d4e97ad
am: aa02888e55

* commit 'aa02888e55147ec78fa5636a87e2447bda136d68':
  DO NOT MERGE Use updated libpng API

Change-Id: I10705dd579623e4b208093cfc4839aad496081c8
2016-05-19 23:17:52 +00:00
Matt Sarett aa02888e55 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630 am: ca45737e27
am: 8a1d4e97ad

* commit '8a1d4e97ad3b748a06db618f9d7ccf5114ea16d0':
  DO NOT MERGE Use updated libpng API

Change-Id: I09e8917976c05beec8bf881140539948c323ce58
2016-05-19 23:14:39 +00:00
Matt Sarett 8a1d4e97ad resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e am: 1f814d7630
am: ca45737e27

* commit 'ca45737e272aeefd657451a6faaa088d1903378c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ia9c36583c9d60d01fec7ee9aefc973dabb1c07d3
2016-05-19 23:12:10 +00:00
Matt Sarett ca45737e27 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f am: 36acff7d7e
am: 1f814d7630

* commit '1f814d7630c56cc9e825ed411e068414c97acb6c':
  DO NOT MERGE Use updated libpng API

Change-Id: Ib381e8ccefe9181911a2144d7255ecadefb42b5c
2016-05-19 23:08:54 +00:00
Matt Sarett 1f814d7630 resolve merge conflicts of 86a28d0 to klp-modular-dev am: a5bc59620f
am: 36acff7d7e

* commit '36acff7d7e88549bbeab6a08488ab48596d7fbc5':
  DO NOT MERGE Use updated libpng API

Change-Id: I7f01d932235ef69640ed4859d0e62344b3b774de
2016-05-19 23:06:06 +00:00
Matt Sarett 36acff7d7e resolve merge conflicts of 86a28d0 to klp-modular-dev
am: a5bc59620f

* commit 'a5bc59620fd43c99621eb98ac84cbeea867d0c93':
  DO NOT MERGE Use updated libpng API

Change-Id: I3d8d27b08fd1fd89c6b8d9c39b883a45aecb83ce
2016-05-19 23:03:35 +00:00
Matt Sarett a5bc59620f resolve merge conflicts of 86a28d0 to klp-modular-dev
Change-Id: Ic0b085e008155da3718dab8fd5a36be6d4059aee
2016-05-19 15:47:25 -04:00
Matt Sarett 86a28d0aaf DO NOT MERGE Use updated libpng API
am: 839b4e592a

* commit '839b4e592a7c81bdebe08fae4eef6e909c89acd6':
  DO NOT MERGE Use updated libpng API

Change-Id: I7bbece70a4129554d953fd22c71527b2ca11262e
2016-05-19 19:26:12 +00:00
Tianjie Xu 142b864ba1 Add time and I/O info to last_install
am: dd874b1c87

* commit 'dd874b1c87eb04f28db0db2629df0adde568a74c':
  Add time and I/O info to last_install

Change-Id: I02aa858d5ce488d3acbf5400811e2565cf7d9c75
2016-05-18 18:44:31 +00:00
Matt Sarett 839b4e592a DO NOT MERGE Use updated libpng API
BUG:23265085
Change-Id: Ibc521fae11dad22283d8469329326ef79525b414
2016-05-17 20:28:54 +00:00
Tianjie Xu dd874b1c87 Add time and I/O info to last_install
One example of last_install is:

/sideload/package.zip
1
time_total: 101
bytes_written_system: 14574000
bytes_stashed_system: 100
bytes_written_vendor: 5107400
bytes_stashed_vendor: 0

Bug: 28658632
Change-Id: I4bf79ea71a609068d38fbce6b41bcb892524aa7a
2016-05-16 14:54:37 -07:00
Jonathan Hamilton 0cc7e28ffd Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0
am: 32c2e78726

* commit '32c2e78726fe9c7cdc927c8435352b2f8e824735':
  Keep ADF device alive for the lifetime of the minui backend

Change-Id: If28a4b4c7098f1a5fcf8e46e03d0df575fc68fce
2016-05-12 17:36:44 +00:00
Jonathan Hamilton 32c2e78726 Merge "Keep ADF device alive for the lifetime of the minui backend"
am: 14352497f0

* commit '14352497f02c38d4f9df46820284c100a1fb58d3':
  Keep ADF device alive for the lifetime of the minui backend

Change-Id: I454b5dcae5bd2ee2e17d607ba70c6c020c76f387
2016-05-12 17:33:19 +00:00
Treehugger Robot 14352497f0 Merge "Keep ADF device alive for the lifetime of the minui backend" 2016-05-12 17:24:24 +00:00
Tao Bao eef053fda1 Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225
am: d03ee52eb7

* commit 'd03ee52eb77d9339b6445d3b4ee5ab7678007c7c':
  updater, minzip: Remove unnecessary O_SYNC flags.

Change-Id: If20abd466bc7e6e918491e168bc00447d36f33da
2016-05-08 18:06:38 +00:00
Alistair Strachan d03ee52eb7 Merge "updater, minzip: Remove unnecessary O_SYNC flags."
am: c7d7eb2225

* commit 'c7d7eb2225c58034d7632ad00bd7269425e7b071':
  updater, minzip: Remove unnecessary O_SYNC flags.

Change-Id: I3c2d0f95d658aab52d88f44999484590b09ea4cd
2016-05-08 18:03:54 +00:00
Tao Bao c7d7eb2225 Merge "updater, minzip: Remove unnecessary O_SYNC flags." 2016-05-08 17:58:19 +00:00
Alistair Strachan 733285fea2 updater, minzip: Remove unnecessary O_SYNC flags.
Remove O_SYNC from mzExtractRecursive() and PackageExtractFileFn().
These functions deal with extracting whole files from the update
package onto a filesystem. If run on ext4 on a rotating disk, for
example, the O_SYNC flag will cause serious performance problems
and the extraction proecss can take over 30 minutes, with no
obvious benefits.

This API function already calls fsync(fd) after each file is
extracted to ensure data and metadata is written to the underlying
block device, so the O_SYNC calls should be superfluous and safely
removable.

This change does not affect the OTA patch paths or any modification
of the bootloader partition or writes to other 'emmc' partitions.

Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
Change-Id: I9cbb98a98e6278bf5c0d7efaae340773d1fbfcd2
2016-05-05 16:04:58 -07:00
Sen Jiang 22431741ce Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99
am: 7caebae682

* commit '7caebae6826c23b9d51a8d74fa6ab6a7d57c61c9':
  applypatch: Use bsdiff from external/bsdiff.

Change-Id: Ie8e8288550d511cee78bf8747dc40e1cedc54800
2016-05-05 22:50:30 +00:00
Sen Jiang 7caebae682 Merge "applypatch: Use bsdiff from external/bsdiff."
am: 704cac2f99

* commit '704cac2f997dd45573593b00e2a266b06e2cc318':
  applypatch: Use bsdiff from external/bsdiff.

Change-Id: Icd23009cb9dd48b119dcf0f67ecb335b6d79e020
2016-05-05 22:45:47 +00:00
Treehugger Robot 704cac2f99 Merge "applypatch: Use bsdiff from external/bsdiff." 2016-05-05 22:35:43 +00:00
Jonathan Hamilton bab6e492ef Keep ADF device alive for the lifetime of the minui backend
Some ADF drivers do some amount of state cleanup when the ADF device
node is closed, making and attempts to draw using it fail.

This changes the minui ADF backend to keep the adf_device open until it
is exited, fixing issues on such devices.
2016-05-05 15:30:57 -07:00
Sen Jiang 2fffcb174b applypatch: Use bsdiff from external/bsdiff.
external/bsdiff uses divsufsort which is much faster, and also include
some bug fixes.

Bug: 26982501
Test: ./imgdiff_test.sh

Change-Id: I089a301c291ee55d79938c7a3ca6d509895440d1
2016-05-03 16:39:51 -07:00
Tao Bao c66a83dac0 Merge "recovery: Always log the update attempt." am: ecd6e2af50
am: 88234ad84b

* commit '88234ad84b9d1cd4b9360a7835bdf5e37044bec6':
  recovery: Always log the update attempt.

Change-Id: I270b07d487b560f4b8dcc2fdc3df2fd2dccec468
2016-05-03 05:47:47 +00:00
Tao Bao 88234ad84b Merge "recovery: Always log the update attempt."
am: ecd6e2af50

* commit 'ecd6e2af5060ba3f7d5c978be6d617d1242f231c':
  recovery: Always log the update attempt.

Change-Id: I40c1f6f85c4aa0f1c12d4b0c47f937612669c6c8
2016-05-03 05:45:05 +00:00
Treehugger Robot ecd6e2af50 Merge "recovery: Always log the update attempt." 2016-05-03 05:40:23 +00:00
Tao Bao 37c45027bb recovery: Always log the update attempt.
An OTA may be skipped due to low battery. But we should always log it to
understand why an update _fails_ to apply.

Bug: 27893175
Change-Id: I50a3fbbb3e51035e0ac5f1cca150e283852825c3
(cherry picked from commit 5687001895)
2016-05-02 21:27:43 -07:00
Tianjie Xu 26f5ab0e9c Make text for recovery larger on angler
am: 087c5edd8d

* commit '087c5edd8dc1e7d46a38ff2df220c29e96b17a1b':
  Make text for recovery larger on angler

Change-Id: I3b56dff9acced0b355643042a0dffb28bd88d6d2
2016-05-02 19:34:00 +00:00
Tianjie Xu 087c5edd8d Make text for recovery larger on angler
Change the link for 560dpi to xxxhdpi from xxhdpi.

Bug: 22465983
Change-Id: I7141ee568cf3e73cdc7e0de986d705c19ac53b1f
2016-05-02 12:20:04 -07:00
Tianjie Xu cacb47b2a3 resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp
Change-Id: I4ec33904a6af38d81b422c7be6f40b828fbc7525
2016-05-02 18:09:26 +00:00
Tianjie Xu 5823dd46df Merge "Add ability to show "installing security update"" into nyc-dev 2016-05-02 17:38:17 +00:00
Tao Bao e0c8a9bb02 recovery: Always log the update attempt.
am: 5687001895

* commit '568700189528c69a6cdd7a246127ce01463e033d':
  recovery: Always log the update attempt.

Change-Id: Ibf0d564c26bb5045fe24466a415dea13cd3a5a18
2016-05-02 16:32:41 +00:00
Tao Bao 5687001895 recovery: Always log the update attempt.
An OTA may be skipped due to low battery. But we should always log it to
understand why an update _fails_ to apply.

Bug: 27893175
Change-Id: I50a3fbbb3e51035e0ac5f1cca150e283852825c3
2016-04-29 15:41:25 -07:00
Chih-hung Hsieh 8d3b85a320 Merge "Fix google-explicit-constructor warnings." am: fafa6a6531
am: 77d7cb1d0a

* commit '77d7cb1d0ab56a726af4b8e07753c8d4c4f65c25':
  Fix google-explicit-constructor warnings.

Change-Id: Iccde2abd9bf0c35c36a1856c7a02207314af466f
2016-04-29 22:33:51 +00:00
Chih-Hung Hsieh 77d7cb1d0a Merge "Fix google-explicit-constructor warnings."
am: fafa6a6531

* commit 'fafa6a65314a5550a045c96768f595567db7bc2d':
  Fix google-explicit-constructor warnings.

Change-Id: Ie13217c835f3b092440e913c407ad5b63b2edcb9
2016-04-29 22:31:39 +00:00
Chih-hung Hsieh fafa6a6531 Merge "Fix google-explicit-constructor warnings." 2016-04-29 22:26:41 +00:00
Chih-Hung Hsieh 49c5c79df1 Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I5b35ae16c069e7e9229e66963386f322bd808af1
2016-04-29 14:16:35 -07:00
Tianjie Xu 35926c4b89 Add ability to show "installing security update"
Add a new command "--security" to boot commands. If this command is
observed as part of BCB, choose a different background text picture
for installing stage in recovery UI. As a result, users will see
"installing security update" instead of "installing system update"
when applying a security update package.

Bug: 27837319
Change-Id: I2e2253a124993ecc24804fa1ee0b918ac96837c5
2016-04-29 12:19:43 -07:00
Tao Bao 6bfe76e1fe Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee
am: 4458d3e

* commit '4458d3e552736facb7b9cd832744d8d47325b4a3':
  updater: Don't zero out CommandParameters with memset(3).

Change-Id: Icc996f7c038a1eb9f861108fffc55e552aa0c42c
2016-04-28 04:39:12 +00:00
Tao Bao 4458d3e552 Merge "updater: Don\'t zero out CommandParameters with memset(3)."
am: df59cee

* commit 'df59ceecfb939c02593425a89757b54c50cc91cf':
  updater: Don't zero out CommandParameters with memset(3).

Change-Id: I36d1395257da1d122e76f8552bb3a2a8f96f60b7
2016-04-28 04:36:12 +00:00
Tao Bao df59ceecfb Merge "updater: Don't zero out CommandParameters with memset(3)." 2016-04-28 04:28:19 +00:00
Elliott Hughes 1dc396f8f4 Merge "Improve the layout-related comments." into nyc-dev
am: 343eb72

* commit '343eb722ddd0146e5c752419b3ff9537cfa2d31d':
  Improve the layout-related comments.

Change-Id: Ib4ff24016ae056a61e755cd953739418035cd8e9
2016-04-28 02:40:39 +00:00
TreeHugger Robot 343eb722dd Merge "Improve the layout-related comments." into nyc-dev 2016-04-28 02:36:12 +00:00
Tianjie Xu e890e194d7 Merge "Update background text for recovery UI" into nyc-dev
am: eeca191

* commit 'eeca191f383d1fda6b1153cf4f443cafff7d7328':
  Update background text for recovery UI

Change-Id: Iacdeece3cee076f1cbb084e4886c3a412f7af9b9
2016-04-28 00:58:33 +00:00
Tianjie Xu eeca191f38 Merge "Update background text for recovery UI" into nyc-dev 2016-04-28 00:48:32 +00:00
Elliott Hughes 21092a9823 Merge "Update recovery UI." into nyc-dev
am: 2f1eedd

* commit '2f1eedded83eea1956ee8b4d391000584588f094':
  Update recovery UI.

Change-Id: Ib43b37f60902b13d1fc4110ad5b394c3c3b39332
2016-04-28 00:44:24 +00:00