Commit Graph

2417 Commits

Author SHA1 Message Date
Jonathan Hamilton 856ba940b7 Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726
am: 0cc7e28ffd

* commit '0cc7e28ffd00cff661d0120e9365b7bfa9bec533':
  Keep ADF device alive for the lifetime of the minui backend

Change-Id: I3ff57ca546aa6d88a73d9ccf986af8e08fa4ee6e
2016-05-12 17:39:20 +00: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
Alistair Strachan aec86d3692 Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7
am: eef053fda1

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

Change-Id: I013b5ea0bff4a8ac9f1b9ed1c4a1d18a67bb3b2c
2016-05-08 18:09:50 +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 24fdd7fbe7 Merge "applypatch: Use bsdiff from external/bsdiff." am: 704cac2f99 am: 7caebae682
am: 22431741ce

* commit '22431741cec2255fa7d539d8f0903a180c66c53c':
  applypatch: Use bsdiff from external/bsdiff.

Change-Id: Ic15b9f27df79a7a61a72c8bc3901337c0fa5c688
2016-05-05 22:55:07 +00: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 fe36a2d0bd Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b
am: c66a83dac0

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

Change-Id: Iec2dc942e8fb9aa138fb8b55842a0c7290fa69b0
2016-05-03 05:50:04 +00: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
Android Build Merger (Role) 805292f764 Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp 2016-05-02 19:38:36 +00:00
Tianjie Xu 1c93e2e6cf Make text for recovery larger on angler am: 087c5edd8d
am: ba4e7977e4

* commit 'ba4e7977e4bcf382eb0cd4e6fa6ca44febe13f83':
  Make text for recovery larger on angler

Change-Id: I2ae25767e5d3fec45068f04398a8052c9b8cb821
2016-05-02 19:38:23 +00:00
Tianjie Xu 4a5213e8ee Make text for recovery larger on angler am: 087c5edd8d
am: 26f5ab0e9c

* commit '26f5ab0e9c4ca93ae461b7284d15bb25da18f084':
  Make text for recovery larger on angler

Change-Id: I5e34aa115fc1c3f82a8d40146286bf52dc31fc2e
2016-05-02 19:38:23 +00: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 ba4e7977e4 Make text for recovery larger on angler
am: 087c5edd8d

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

Change-Id: I54421156aa6c261e9aa8a68fade71eebb5ed95fa
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 b5de6a20a7 resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp
am: cacb47b2a3

* commit 'cacb47b2a38a84eaae94dd10857a83b7c6b1885e':

Change-Id: Icdaf7e9132e807ae9a7076b92b91bae8632269ec
2016-05-02 18:27:24 +00:00
Tianjie Xu 70b5353274 resolve merge conflicts of 23c7af7 to nyc-mr1-dev-plus-aosp
Change-Id: I04a73db90ddb059dbb5b44fafd8e82d03ea90ca5
2016-05-02 11:17:57 -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 23c7af797a Merge "Add ability to show "installing security update"" into nyc-dev
am: 5823dd46df

* commit '5823dd46df9667c43e8fc3f5ff79987b7432da3f':
  Add ability to show "installing security update"

Change-Id: Ibe1667e9bd721d73a972f9c21a322c8ea088dc63
2016-05-02 17:47:52 +00:00
Tianjie Xu 5823dd46df Merge "Add ability to show "installing security update"" into nyc-dev 2016-05-02 17:38:17 +00:00
Android Build Merger (Role) ce7c6ff48e Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp 2016-05-02 16:37:12 +00:00
Tao Bao 41584111b5 recovery: Always log the update attempt. am: 5687001895
am: e0c8a9bb02

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

Change-Id: I02178398bd8bbee8c106320a9e9564bedd19c97a
2016-05-02 16:37:01 +00:00
Tao Bao 07fe1c6696 recovery: Always log the update attempt. am: 5687001895
am: f13662a349

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

Change-Id: I8d111ff9bf410d87e957d6a475c319abba5c7489
2016-05-02 16:37:01 +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 f13662a349 recovery: Always log the update attempt.
am: 5687001895

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

Change-Id: I48f3199c4640a17ae022879082f8de9948d94925
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 ac7d8f278b Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a
am: 8d3b85a320

* commit '8d3b85a32005df441ae0afde7b9f924824f1446e':
  Fix google-explicit-constructor warnings.

Change-Id: I1eac3384574974067701031b952e9a59aac81ba7
2016-04-29 22:36:10 +00: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 187e7c7ab0 Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e
am: 6bfe76e

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

Change-Id: I057454ed02d17b3fec2fbb4a653b4aedeeee2a43
2016-04-28 04:42:11 +00: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
Android Build Merger (Role) 3a6c28f1f8 Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp 2016-04-28 02:43:43 +00:00
TreeHugger Robot a8e793b9d4 Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
am: 1dc396f

* commit '1dc396f8f4bcadca3c39ea9f4025d669564f171b':
  Improve the layout-related comments.

Change-Id: I900676d63fdb55957de1d6a798c1530f2d2e0f12
2016-04-28 02:43:31 +00:00
TreeHugger Robot ed5b648c0e Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
am: a7f7e70

* commit 'a7f7e7093ea67c3ddda03f52edb440c780d69b0d':
  Improve the layout-related comments.

Change-Id: I957cc75b064b1d0be5cee54af7b27f008a7a22a1
2016-04-28 02:43:30 +00:00