PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,560 Commits 1 Branch 0 Tags
cfb45bd7b9a8537e5e7ffa4b78d5cb3aebd4daad
Commit Graph

2560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Sarett cfb45bd7b9 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 am: 8a55c65345 
am: b898481de7

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

Change-Id: I5cdfad96ed0a6ffde2c197ef7957192d9b0c1a16
 2016-05-20 00:07:25 +00:00
Matt Sarett b898481de7 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 
am: 8a55c65345

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

Change-Id: Id8a3a6a56edc5fbc9a10e08d9c09f47850964612
 2016-05-19 23:31:23 +00:00
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 ccf1b95c08 Add time and I/O info to last_install am: dd874b1c87 am: 142b864ba1 
am: 46aa5911d8

* commit '46aa5911d810e09e2a90492dd5865cfe25c31b6d':

Change-Id: Idd29ee0695656527fff8d8eda32f777e84b42193
 2016-05-18 18:54:59 +00:00
Tianjie Xu 0f85209b2e Add time and I/O info to last_install am: dd874b1c87 am: 027b403e8a 
am: fb5d7f6172

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

Change-Id: I3e80f862aff97a2fbbd2324cbbc5d16aede196f3
 2016-05-18 18:54:59 +00:00
Tianjie Xu 46aa5911d8 Add time and I/O info to last_install am: dd874b1c87 
am: 142b864ba1

* commit '142b864ba1121365f8bc95075cb05495c351194e':

Change-Id: I5b817e54c97bd67109e8269c93c3a1c14c0a3b86
 2016-05-18 18:50:03 +00:00
Tianjie Xu fb5d7f6172 Add time and I/O info to last_install am: dd874b1c87 
am: 027b403e8a

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

Change-Id: I04c368dd551946427f683df906eb42e0f2f740e9
 2016-05-18 18:47:31 +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
Tianjie Xu 027b403e8a Add time and I/O info to last_install 
am: dd874b1c87

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

Change-Id: I487bdc54897816fe8ed24b441a848cac1dc29389
 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 027c1334e6 Merge "Keep ADF device alive for the lifetime of the minui backend" am: 14352497f0 am: 32c2e78726 am: 0cc7e28ffd 
am: 856ba940b7

* commit '856ba940b75cf4cf0ab81319443d82fef40ada2f':
  Keep ADF device alive for the lifetime of the minui backend

Change-Id: Ic43fc26c107b99b4caf1bd18832ee03e00f1799c
 2016-05-12 17:45:08 +00:00
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
Tao Bao d654c35ab2 Merge "updater, minzip: Remove unnecessary O_SYNC flags." am: c7d7eb2225 am: d03ee52eb7 am: eef053fda1 
am: aec86d3692

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

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

* commit '24fdd7fbe7cda79a6d15a4cb1714286c18828135':
  applypatch: Use bsdiff from external/bsdiff.

Change-Id: I1d43301f9dda77537880a425d008784d3c8ba6bf
 2016-05-05 22:59:47 +00: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 44b0a61f73 Merge "recovery: Always log the update attempt." am: ecd6e2af50 am: 88234ad84b am: c66a83dac0 
am: fe36a2d0bd

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

Change-Id: I85e13bee2fa0c503392f9ea36f1676b8d09276e2
 2016-05-03 05:52:18 +00: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
Tianjie Xu 3b7c4fafdd Merge "Make text for recovery larger on angler am: 087c5edd8d am: 26f5ab0e9c" into nyc-mr1-dev-plus-aosp 
am: 805292f764

* commit '805292f76435b0ca14fcfcd192884bbbaf77a424':

Change-Id: I31c9407e924503371ca97208a7592fb617a4dd98
 2016-05-02 19:43:14 +00:00
Tianjie Xu 6e284891b9 Make text for recovery larger on angler am: 087c5edd8d am: ba4e7977e4 
am: 1c93e2e6cf

* commit '1c93e2e6cf15eabb4d23deaa0738b92252f31816':
  Make text for recovery larger on angler

Change-Id: I49bdc07f496f13d292b8d0256a0fb805ec49fe8e
 2016-05-02 19:43:14 +00: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