Commit graph

13168 commits

Author SHA1 Message Date
Dan Albert
bc4b8c1845 am 9dd0914a: Merge "Turn on -Wextra."
* commit '9dd0914ac96e77a725c696dd557d56528316e8de':
  Turn on -Wextra.
2015-05-21 22:47:15 +00:00
Dan Albert
9dd0914ac9 Merge "Turn on -Wextra." 2015-05-21 22:38:40 +00:00
Dan Albert
23fee8fcf5 Turn on -Wextra.
Change-Id: I3cddd6d949fdfa79312246670c37475276734f41
2015-05-21 15:15:11 -07:00
Paul Crowley
5f3c715e1a am 7f623dec: Merge "Set up crypto for user directories in init."
* commit '7f623decf31028b5a745a1dc8902ee78d0adb44c':
  Set up crypto for user directories in init.
2015-05-21 21:46:39 +00:00
Paul Crowley
7f623decf3 Merge "Set up crypto for user directories in init." 2015-05-21 21:34:12 +00:00
Andreas Gampe
82733bd990 am 02b29c49: Merge "LibNativeBridge: Version 2"
* commit '02b29c49d4a6f72f90b2c7565cf25b0971906839':
  LibNativeBridge: Version 2
2015-05-21 00:31:16 +00:00
Andreas Gampe
02b29c49d4 Merge "LibNativeBridge: Version 2" 2015-05-21 00:21:02 +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
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
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
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
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
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
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
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
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
Dan Albert
d92fd41f69 Merge "Make connection states a proper type." 2015-05-19 00:29:54 +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
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
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
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
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
Dan Albert
747a6f22cd Merge "adb: win32: fix key files reading/writing" 2015-05-16 01:04:21 +00:00
Badhri Jagan Sridharan
bf11095f92 fastboot: Add support for fastboot flashing commands
Commands added:
fastboot flashing lock
      - Prevents flashing partitions
fastboot flashing unlock
      - Enable user to flashing partitions
fastboot flashing lock_critical
      - Prevents flashing bootloader related
        paritions
fastboot flashing unlock_critical
      - Enables user to flash bootloader
        related partitions
fastboot flashing get_unlock_ability
      - Query bootloader to check if device is
        locked.

Change-Id: Id6db16ba32f7a2b1c3f041a76bd3bdf2d3ab471e
2015-05-15 18:00:50 -07:00
Elliott Hughes
5e1ca285b5 am 3937120f: Merge "Switch to toybox ls."
* commit '3937120f320523c8464255d29d7173f62bef6e2a':
  Switch to toybox ls.
2015-05-16 00:48:44 +00:00
Dan Albert
e61ecc4b47 am 792b4f8c: Merge "Make pty raw in adb shell when non-interactive."
* commit '792b4f8cc2f8bdfcd603e05b03153331eec1f94a':
  Make pty raw in adb shell when non-interactive.
2015-05-16 00:48:43 +00:00
Elliott Hughes
3937120f32 Merge "Switch to toybox ls." 2015-05-16 00:45:28 +00:00
Christopher Ferris
76caf5a576 am a4e7f07f: Merge "Switch UniquePtr to std::unique_ptr."
* commit 'a4e7f07f772397727db6070e8fd183bc81b8212c':
  Switch UniquePtr to std::unique_ptr.
2015-05-16 00:41:38 +00:00
Dan Albert
792b4f8cc2 Merge "Make pty raw in adb shell when non-interactive." 2015-05-16 00:41:05 +00:00
Christopher Ferris
a4e7f07f77 Merge "Switch UniquePtr to std::unique_ptr." 2015-05-16 00:35:34 +00:00
Dan Albert
569a130196 Make pty raw in adb shell when non-interactive.
The main goal here is fixing the line ending translation from \n to
\r\n, but we probably don't want any translation to happen.

Bug: http://b/19735063
Change-Id: I1d6d6c6b57cc741b046c2432cd864b344ce1f28a
2015-05-15 17:33:05 -07:00
Christopher Ferris
6e96403b8f Switch UniquePtr to std::unique_ptr.
Bug: 21209050
Change-Id: I91d4c44de479b37f2729382fcdf103b8c69aa668
2015-05-15 17:30:21 -07:00
Elliott Hughes
9c94aa9982 Switch to toybox ls.
Bug: http://b/21171466
Change-Id: I3fa09db7ca43d337cbda60f10269e7607544982b
2015-05-15 16:54:35 -07:00
Dan Albert
8fb4d99478 am 4e000812: Merge "adb: win32: fix StringPrintf format string checking of %zd and PRIu64"
* commit '4e0008123d0828e8b8ab31c81ebdbc5dc3656e88':
  adb: win32: fix StringPrintf format string checking of %zd and PRIu64
2015-05-15 22:59:36 +00:00
Dan Albert
4e0008123d Merge "adb: win32: fix StringPrintf format string checking of %zd and PRIu64" 2015-05-15 22:49:59 +00:00
Dan Albert
e9e6eb82b6 am 0df06907: Merge "adb: win32: fix daemon acknowledgement"
* commit '0df06907b42d5deea3d55411d98e273e204390ab':
  adb: win32: fix daemon acknowledgement
2015-05-15 21:56:44 +00:00
Dan Albert
0df06907b4 Merge "adb: win32: fix daemon acknowledgement" 2015-05-15 21:47:07 +00:00
Elliott Hughes
d09e316906 am d0008c97: Merge "Fix \' escaping in adb."
* commit 'd0008c971dce0e90f49426ac79af190514551f1f':
  Fix ' escaping in adb.
2015-05-15 21:19:21 +00:00
Elliott Hughes
d0008c971d Merge "Fix ' escaping in adb." 2015-05-15 21:11:25 +00:00
Elliott Hughes
84b0bf2264 Fix ' escaping in adb.
You can't just use \' inside a single-quoted string.

Bug: http://b/20323053
Bug: http://b/3090932
Change-Id: I73754b097671d02dc11c35052f0534b6dd789e4f
2015-05-15 12:06:00 -07:00