Commit Graph

947 Commits

Author SHA1 Message Date
The Android Automerger 28754d4f42 merge in lmp-mr1-release history after reset to fe8563f4f2 2014-10-26 06:08:42 -07:00
The Android Automerger 512eddf4ae merge in lmp-mr1-release history after reset to fe8563f4f2 2014-10-25 06:09:00 -07:00
Michael Runge fe8563f4f2 am 5ddf4293: Log mount/unmount errors to UI
* commit '5ddf4293df45a051c7900eeb62fb5ec4950b6cb6':
  Log mount/unmount errors to UI
2014-10-24 23:17:43 +00:00
Michael Runge 5ddf4293df Log mount/unmount errors to UI
Bug: 18092022
Change-Id: I6c42038ebeb1cfc1e7ca0d3e12310fdce1b990b0
2014-10-24 14:14:41 -07:00
Nick Kralevich 915d661ccc am 68802416: unconditionally apply SELinux labels to symlinks
* commit '688024169df70336cc128ea8cc929174c53a501e':
  unconditionally apply SELinux labels to symlinks
2014-10-24 17:43:15 +00:00
Nick Kralevich 688024169d unconditionally apply SELinux labels to symlinks
At the end of the OTA script, we walk through /system, updating
all the permissions on the filesystem, including the UID, GID,
standard UNIX permissions, capabilities, and SELinux labels.

In the case of a symbolic link, however, we want to skip most of
those operations. The UID, GID, UNIX permissions, and capabilities
don't meaningfully apply to symbolic links.

However, that's not true with SELinux labels. The SELinux label on
a symbolic link is important. We need to make sure the label on the
symbolic link is always updated, even if none of the other attributes
are updated.

This change unconditionally updates the SELinux label on the symbolic
link itself. lsetfilecon() is used, so that the link itself is updated,
not what it's pointing to.

In addition, drop the ENOTSUP special case. SELinux has been a
requirement since Android 4.4. Running without filesystem extended
attributes is no longer supported, and we shouldn't even try to handle
non-SELinux updates anymore. (Note: this could be problematic if
these scripts are ever used to produce OTA images for 4.2 devices)

Bug: 18079773
Change-Id: I87f99a1c88fe02bb2914f1884cac23ce1b385f91
2014-10-23 20:46:33 -07:00
Michael Runge da500cecf5 am 168f7778: Allow passing of mount args to mountFn
* commit '168f77787700f0e9f66675beef33c593a777e64e':
  Allow passing of mount args to mountFn
2014-10-23 21:56:52 +00:00
Brian Carlstrom 4da9cdeab9 am 473967d8: Merge "Log to UI any metadata setting errors" into lmp-dev
* commit '473967d87ff9fc7a541c16ebdc56364c285d2862':
  Log to UI any metadata setting errors
2014-10-23 21:56:52 +00:00
Michael Runge 168f777877 Allow passing of mount args to mountFn
Bug: 18079773
Bug: 18092222

Change-Id: Ifc3f3e123de729dfbb2f49414b3207afa96268d5
2014-10-23 18:13:26 +00:00
Brian Carlstrom 473967d87f Merge "Log to UI any metadata setting errors" into lmp-dev 2014-10-23 17:18:13 +00:00
Michael Runge d4a63426ef Log to UI any metadata setting errors
Bug: 18079773
Change-Id: Ic6fddbcbcb6ddb9e1cbd1698df98387c0033ae15
2014-10-23 10:06:33 -07:00
Nick Kralevich d0602fbb88 am 9b2db80d: Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev
* commit '9b2db80d407752fd524e799e4c7051162e63f91c':
  Make /cache/recovery/last_log available in recovery
2014-10-23 16:34:39 +00:00
Michael Runge 3b5c6dca0a am 2f0ef730: Treat already-renamed files as having no problems.
* commit '2f0ef73029fc51c6404121f338b034c8b516652c':
  Treat already-renamed files as having no problems.
2014-10-23 16:34:38 +00:00
Nick Kralevich 9b2db80d40 Merge "Make /cache/recovery/last_log available in recovery" into lmp-dev 2014-10-23 15:37:10 +00:00
The Android Automerger 249604c5da merge in lmp-mr1-release history after reset to 9eb8c8bdbe 2014-10-23 06:09:34 -07:00
Nick Kralevich a9ad0324d1 Make /cache/recovery/last_log available in recovery
Create a new recovery UI option to allow the user to view
/cache/recovery/last_log for their device. This gives enhanced
debugging information which may be necessary when a failed
OTA occurs.

Bug: 18094012
Change-Id: Ic3228de96e9bfc2a0141c7aab4ce392a38140cf3
2014-10-22 21:43:08 -07:00
Michael Runge 2f0ef73029 Treat already-renamed files as having no problems.
This should help with reentrant OTAs.

Bug: 18079773

Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
2014-10-23 00:04:36 +00:00
The Android Automerger e458ddc583 merge in lmp-mr1-release history after reset to 9eb8c8bdbe 2014-10-22 06:08:47 -07:00
The Android Automerger 0951a52857 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-21 06:08:48 -07:00
JP Abgrall 9eb8c8bdbe init.rc: Inidicate that booting is complete wrt firwmare requests
ueventd will wait for /dev/.booting to go away before giving up
on loading firmware.
The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710
which forgot to update recovery's init.rc

Bug: 17993625
Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
2014-10-20 20:02:57 -07:00
The Android Automerger 4bc3aa2f5b merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-20 06:08:45 -07:00
The Android Automerger 7c2f54b9b3 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-19 06:08:39 -07:00
The Android Automerger b453560037 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-18 06:09:04 -07:00
The Android Automerger d9993ef3f7 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-16 06:09:17 -07:00
The Android Automerger f6674a8b1a merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-15 06:09:03 -07:00
The Android Automerger f780f45619 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-14 06:09:00 -07:00
The Android Automerger 1556403aa4 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-13 06:09:13 -07:00
The Android Automerger 8debce84fc merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-12 06:08:41 -07:00
The Android Automerger 4d57875221 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-11 06:08:51 -07:00
The Android Automerger 50459cc133 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-09 06:08:54 -07:00
The Android Automerger fbf0d5634f merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-08 06:09:29 -07:00
The Android Automerger 4cb5ede199 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-07 06:08:56 -07:00
The Android Automerger a3c695c116 merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-06 06:08:58 -07:00
The Android Automerger 8a5535a9db merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-05 06:08:49 -07:00
The Android Automerger db4616078e merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-04 06:09:08 -07:00
The Android Automerger 526dcd8a7d merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-02 06:09:29 -07:00
The Android Automerger c13e614efd merge in lmp-mr1-release history after reset to d83e4f1589 2014-10-01 06:09:17 -07:00
The Android Automerger ab8aa3eff3 merge in lmp-mr1-release history after reset to d83e4f1589 2014-09-30 06:09:56 -07:00
The Android Automerger c8ff5bc699 merge in lmp-mr1-release history after reset to d83e4f1589 2014-09-29 06:09:52 -07:00
The Android Automerger acfc400adb merge in lmp-mr1-release history after reset to d83e4f1589 2014-09-28 06:08:55 -07:00
The Android Automerger 0e212f7671 merge in lmp-mr1-release history after reset to d83e4f1589 2014-09-27 06:09:14 -07:00
Doug Zongker d83e4f1589 support for version 2 of block image diffs
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.

This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all.  This comes at the cost of the RAM or scratch disk needed to
store the data.

The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.

Change-Id: I4559bfd76d5403859637aeac832f3a5e9e13b63a
2014-09-25 16:38:14 -07:00
The Android Automerger 25bbde071b merge in lmp-mr1-release history after reset to 574443d895 2014-09-25 06:09:39 -07:00
Jeff Sharkey a6e13ae01b Include reason when wiping data.
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
2014-09-24 11:46:17 -07:00
The Android Automerger f55264dace merge in lmp-mr1-release history after reset to 574443d895 2014-09-24 06:09:56 -07:00
The Android Automerger d0acb96eab merge in lmp-mr1-release history after reset to 574443d895 2014-09-23 15:13:52 -07:00
The Android Automerger f85e0ddf03 merge in lmp-mr1-release history after reset to 574443d895 2014-09-23 04:45:30 -07:00
The Android Automerger ca58d2c010 merge in lmp-mr1-release history after reset to 574443d895 2014-09-22 11:44:31 -07:00
The Android Automerger b79f5f8aed merge in lmp-mr1-release history after reset to 574443d895 2014-09-22 11:13:43 -07:00
The Android Automerger 136c97c93b merge in lmp-mr1-release history after reset to 574443d895 2014-09-22 10:17:01 -07:00