Commit Graph

14947 Commits

Author SHA1 Message Date
Dan Albert 598e09eead am 6bb4d249: am b7930843: Merge "adb / libbase: clean up NOGDI and evil ERROR macro"
* commit '6bb4d249226de97f27db21976b988a09a1eedb0d':
  adb / libbase: clean up NOGDI and evil ERROR macro
2015-05-20 20:10:06 +00:00
Dan Albert 6bb4d24922 am b7930843: Merge "adb / libbase: clean up NOGDI and evil ERROR macro"
* commit 'b7930843d3f0d003ff44a3485a63a123ded6f1cb':
  adb / libbase: clean up NOGDI and evil ERROR macro
2015-05-20 19:56:47 +00:00
Dan Albert b7930843d3 Merge "adb / libbase: clean up NOGDI and evil ERROR macro" 2015-05-20 19:45:49 +00:00
Mark Salyzyn ee5e465f87 am 8275cf14: am 9ab8c973: Merge "logd: worst-UID only to preserve a day"
* commit '8275cf149278f671fb34b5f20d706b8bdb25957f':
  logd: worst-UID only to preserve a day
2015-05-20 19:25:40 +00:00
Spencer Low ac3f7d9a78 adb / libbase: clean up NOGDI and evil ERROR macro
Instead of defining and undefining NOGDI:

1. Always #include "base/logging.h" after #include <windows.h>.
Unfortunately, I could not find an easy way to give the user a
warning/error if they include in the wrong order.

2. base/logging.h does #undef ERROR to undefine the evil ERROR macro
that is from another era and probably a bad idea to begin with.

Change-Id: I995d89620611e849af9d7ec47eb55fc0512377f2
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-05-20 12:25:19 -07:00
Mark Salyzyn 3577b8c566 am 94a811ab: logd: worst-UID only to preserve a day
* commit '94a811ab19006ec6c4d8057f3bf81d79308d28f6':
  logd: worst-UID only to preserve a day
2015-05-20 17:34:13 +00:00
Mark Salyzyn 8275cf1492 am 9ab8c973: Merge "logd: worst-UID only to preserve a day"
* commit '9ab8c973310b80362918c516c1edeec015801adc':
  logd: worst-UID only to preserve a day
2015-05-20 17:13:30 +00:00
Mark Salyzyn 94a811ab19 logd: worst-UID only to preserve a day
(cherry pick from commit 833a9b1e38)

Do not invoke worst-UID pruning in the face of other
UIDs logs that are more than a day old, switch to
pruning oldest only.

Change-Id: Icf988b8d5458400a660d0f8e9d2df3f9d9a4c2d9
2015-05-20 10:03:11 -07:00
Mark Salyzyn 9ab8c97331 Merge "logd: worst-UID only to preserve a day" 2015-05-20 17:00:10 +00:00
Mark Salyzyn 833a9b1e38 logd: worst-UID only to preserve a day
Do not invoke worst-UID pruning in the face of other
UIDs logs that are more than a day old, switch to
pruning oldest only.

Change-Id: Icf988b8d5458400a660d0f8e9d2df3f9d9a4c2d9
2015-05-20 09:47:54 -07:00
Nick Kralevich 1610b953bb am 8d592931: am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"
* commit '8d592931a1a45e99ef963abc0dffc895739ef7ec':
  Don't use TEMP_FAILURE_RETRY on close()
2015-05-20 16:20:53 +00:00
Nick Kralevich 8d592931a1 am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"
* commit '6a8b7b65f59452493423d9a56c7b3d4f1eedfd83':
  Don't use TEMP_FAILURE_RETRY on close()
2015-05-20 16:13:29 +00:00
Nick Kralevich 6a8b7b65f5 Merge "Don't use TEMP_FAILURE_RETRY on close()" 2015-05-20 16:04:37 +00:00
Nick Kralevich 95db36e128 Don't use TEMP_FAILURE_RETRY on close()
See https://lkml.org/lkml/2005/9/10/129 for details.

Bug: 20501816
Change-Id: I38bf5052f44034c6f866d10d7d07187f0053a7a1
2015-05-20 09:02:29 -07:00
Paul Crowley ce6f716096 Set up crypto for user directories in init.
Depends on https://android-review.googlesource.com/#/c/147911/

Bug: 19704432
Change-Id: Ie59c6b67f73c1cadd86e69d3c9673ddaddb49a7e
2015-05-20 08:28:21 +01:00
Nick Kralevich b4767ed1c9 am 98ecabce: am fe5b2513: Merge "klog: don\'t unconditionally call mknod()"
* commit '98ecabcede2d594fb5b6a8a28749404d44bec62a':
  klog: don't unconditionally call mknod()
2015-05-20 01:47:10 +00:00
Nick Kralevich 27fe3cb63f am 7eb3abdb: klog: don\'t unconditionally call mknod()
* commit '7eb3abdb3ba500d3acca82b95705f34128251015':
  klog: don't unconditionally call mknod()
2015-05-19 23:03:19 +00:00
Nick Kralevich 7eb3abdb3b klog: don't unconditionally call mknod()
If /dev/kmsg already exists, it's unnecessary for klog_init()
to create it's own copy. This avoids needing to grant the mknod
permission to everyone who uses kmsg. Typically the only time
/dev/kmsg doesn't exist is before ueventd starts.

(cherrypicked from commit 4d32a486fe)

Bug: 21242418
Change-Id: I0c88d80feca6899fcdbc8c9f2f99448ee0a3422d
2015-05-19 15:19:25 -07:00
Nick Kralevich 98ecabcede am fe5b2513: Merge "klog: don\'t unconditionally call mknod()"
* commit 'fe5b25132937963c8d9aef532bb0bb53bc0cea1f':
  klog: don't unconditionally call mknod()
2015-05-19 22:12:53 +00:00
Nick Kralevich fe5b251329 Merge "klog: don't unconditionally call mknod()" 2015-05-19 22:01:06 +00:00
Badhri Jagan Sridharan ea6ffb9084 am b7d50950: am 32685944: Merge "fastboot: Add support for fastboot flashing commands"
* commit 'b7d50950756a55cc405f336faf30fd05228528a9':
  fastboot: Add support for fastboot flashing commands
2015-05-19 21:17:40 +00:00
Badhri Jagan Sridharan b7d5095075 am 32685944: Merge "fastboot: Add support for fastboot flashing commands"
* commit '32685944b7c2379524d75cd6a21408e4ab18d55e':
  fastboot: Add support for fastboot flashing commands
2015-05-19 17:48:49 +00:00
Badhri Jagan Sridharan 32685944b7 Merge "fastboot: Add support for fastboot flashing commands" 2015-05-19 17:41:39 +00:00
Tao Bao e48aed0f0a Change pre-recovery into two services
/system/bin/uncrypt needs to be triggered to prepare the OTA package
before rebooting into the recovery. Separate pre-recovery (uncrypt)
into two services: uncrypt that does the uncryption work and
pre-recovery that actually reboots the device into recovery.

Also create /cache/recovery on post-fs in case it doesn't exist.

Bug: 20012567
Bug: 20949086
Change-Id: If67fe1e9ee6279593d2788452febcd3f0fe714c2
2015-05-19 10:04:56 -07:00
Nick Kralevich 4d32a486fe klog: don't unconditionally call mknod()
If /dev/kmsg already exists, it's unnecessary for klog_init()
to create it's own copy. This avoids needing to grant the mknod
permission to everyone who uses kmsg. Typically the only time
/dev/kmsg doesn't exist is before ueventd starts.

Bug: 21242418
Change-Id: I0c88d80feca6899fcdbc8c9f2f99448ee0a3422d
2015-05-18 18:43:28 -07:00
Dan Albert 8c4b478083 am dfd1a3d4: am d92fd41f: Merge "Make connection states a proper type."
* commit 'dfd1a3d43cfe937fa038f4f22f8d00431226a7d1':
  Make connection states a proper type.
2015-05-19 00:58:54 +00:00
Adam Lesinski b278ab2f0f am 0ebd13f0: Merge "Prevent integer overflow when allocating native_handle_t" into mnc-dev
* commit '0ebd13f0639ddfc3e6e96bbcc6ce5465ca489808':
  Prevent integer overflow when allocating native_handle_t
2015-05-19 00:55:12 +00:00
Dan Albert dfd1a3d43c am d92fd41f: Merge "Make connection states a proper type."
* commit 'd92fd41f693e1ea7dfbb0e8b3df8fd3a85910d71':
  Make connection states a proper type.
2015-05-19 00:42:40 +00:00
Adam Lesinski 0ebd13f063 Merge "Prevent integer overflow when allocating native_handle_t" into mnc-dev 2015-05-19 00:30:24 +00:00
Dan Albert d92fd41f69 Merge "Make connection states a proper type." 2015-05-19 00:29:54 +00:00
Dan Albert 9f0f305b52 am 3896033f: am 155f7ac7: Merge "Ignore whitespace/indent issues from cpplint."
* commit '3896033f0531d66f0525c702fef13831f3d6addb':
  Ignore whitespace/indent issues from cpplint.
2015-05-19 00:23:13 +00:00
Dan Albert dcd78a15d0 Make connection states a proper type.
Change-Id: I809f9b327c832b88dd63151bf7dcb012d88e81c4
2015-05-18 17:10:33 -07:00
Dan Albert 3896033f05 am 155f7ac7: Merge "Ignore whitespace/indent issues from cpplint."
* commit '155f7ac796f2178886003dbf4e064acdb3089d1e':
  Ignore whitespace/indent issues from cpplint.
2015-05-19 00:09:34 +00:00
Jeff Brown 4a3a40ac07 am ac9131b3: Merge "Add TEMP_FAILURE_RETRY to libsuspend." into mnc-dev
* commit 'ac9131b30ce333158cc5a43e83a7f776af592fea':
  Add TEMP_FAILURE_RETRY to libsuspend.
2015-05-19 00:05:18 +00:00
Dan Albert 155f7ac796 Merge "Ignore whitespace/indent issues from cpplint." 2015-05-18 23:59:55 +00:00
Dan Albert 075e8608a7 Ignore whitespace/indent issues from cpplint.
Unfortunately this lint check also fires when public/private are not
indented by a single space. The indentation format in adb does not
match google style, so that's not going to happen.

Change-Id: I35e5654a2359222bb274ac5fb2961aee6a3a280f
2015-05-18 16:49:07 -07:00
Jeff Brown ac9131b30c Merge "Add TEMP_FAILURE_RETRY to libsuspend." into mnc-dev 2015-05-18 23:02:52 +00:00
Jeff Brown 0446e16f53 Add TEMP_FAILURE_RETRY to libsuspend.
In testing, I observed one instance of a call failing due to a signal
sent to the process.  This could happen at various times so it's better
to be safe than sorry.

Bug: 20534809
Change-Id: I42242087300d8b840a50aec34aa6b2e1507cab50
2015-05-18 15:53:56 -07:00
Michael Lentine 6078805023 Adding a build id check to blob cache.
Add a build id field to the header structure in blob cache. Add build
id support with reading and writing the cache. When the cache gets
written it writes the build id at the end of the header. When read it
checks to see if there is a match between the current version and the
version in the cache. If not, it invalidates the cache which would
typically only occur during an ota update.  Also remove blob cache
from the host build.

bug: 18262905

Change-Id: I753b1de1986703a4c1c8691b9d2bb533b2546143
2015-05-18 13:14:32 -07:00
Elliott Hughes 6905f6d70c am 4652fc6f: Revert "Switch to toybox ls."
* commit '4652fc6f08e9b03240980cdec42d66514fdc4a64':
  Revert "Switch to toybox ls."
2015-05-16 06:54:19 +00:00
Elliott Hughes e74a84ba89 am 1ec2d1d2: am 917b455e: Merge "Revert "Switch to toybox ls.""
* commit '1ec2d1d297cd7ad60a88da9a0b53f2ef3c37f26d':
  Revert "Switch to toybox ls."
2015-05-16 06:50:24 +00:00
Elliott Hughes 1ec2d1d297 am 917b455e: Merge "Revert "Switch to toybox ls.""
* commit '917b455ee78949701d2ee0ec72d9cdb44329d028':
  Revert "Switch to toybox ls."
2015-05-16 06:37:40 +00:00
Elliott Hughes 4652fc6f08 Revert "Switch to toybox ls."
This reverts commit 9c94aa9982.

Change-Id: Ie2479ee4a0614e285ce8d57c727200a0381904e2
(cherry picked from commit 88f0f4b2b4)
2015-05-15 23:31:08 -07:00
Elliott Hughes 917b455ee7 Merge "Revert "Switch to toybox ls."" 2015-05-16 06:28:34 +00:00
Elliott Hughes 88f0f4b2b4 Revert "Switch to toybox ls."
This reverts commit 9c94aa9982.

Change-Id: Ie2479ee4a0614e285ce8d57c727200a0381904e2
2015-05-16 06:28:10 +00:00
Elliott Hughes 47b0134ec2 Don't use TEMP_FAILURE_RETRY on close in system/core.
Bug: http://b/20501816
Change-Id: I1839b48ee4f891b8431ecb809e37a4566a5b3e50
2015-05-15 19:16:40 -07:00
Elliott Hughes 880a2f1ce4 am 7b071e53: Switch to toybox ls.
* commit '7b071e53fa59e7ad108f6754929216f3aaef62ee':
  Switch to toybox ls.
2015-05-16 01:35:43 +00:00
Dan Albert b4fd608214 am 93f7040d: am 747a6f22: Merge "adb: win32: fix key files reading/writing"
* commit '93f7040d1a0ceb6272dc5eb7c749c52ae4fee58d':
  adb: win32: fix key files reading/writing
2015-05-16 01:25:59 +00:00
Christopher Ferris aed5a43006 am f0861f9f: Switch UniquePtr to std::unique_ptr.
* commit 'f0861f9f8fb1884e863fdf5e1b95d69d43d8b1ff':
  Switch UniquePtr to std::unique_ptr.
2015-05-16 01:18:38 +00:00
Dan Albert 93f7040d1a am 747a6f22: Merge "adb: win32: fix key files reading/writing"
* commit '747a6f22cda0c74b66777e75aff384f0c09474ba':
  adb: win32: fix key files reading/writing
2015-05-16 01:12:37 +00:00