Commit Graph

11820 Commits

Author SHA1 Message Date
Paul Lawrence 22bb896b74 Merge "Fix build" 2014-12-04 22:58:07 +00:00
Paul Lawrence 731136ca36 Fix build
Change-Id: I9b493fd5fc5c5f62f02bc5234ccca2a5118380b4
2014-12-04 14:54:18 -08:00
Paul Lawrence 6020f9bb8c Merge "Add adb enable-verity" 2014-12-04 22:24:39 +00:00
Paul Lawrence 7c442e1700 Add adb enable-verity
Note that it is *easy* to break your phone with this feature. It is
not a bug that reenabling verity after changing one byte of the system
partition stops the device booting.

Bug: 18529433
Change-Id: I632e91281884471a362960f1ba30312d2669b8ff
2014-12-04 14:14:58 -08:00
Elliott Hughes 4231485db0 am caaaa278: am 6855af41: Merge "libpixelflinger should #define __ARM_HAVE_NEON."
* commit 'caaaa278651590bb838e4bb550303771a167eaaf':
  libpixelflinger should #define __ARM_HAVE_NEON.
2014-12-04 19:59:16 +00:00
Elliott Hughes caaaa27865 am 6855af41: Merge "libpixelflinger should #define __ARM_HAVE_NEON."
* commit '6855af4135c9cd29a42f7c22ca7c394d902faea5':
  libpixelflinger should #define __ARM_HAVE_NEON.
2014-12-04 19:51:25 +00:00
Elliott Hughes c8034164bb am fa969cd1: am 023bc0a4: Merge "Fix deadlocks."
* commit 'fa969cd1f93d186acc9ce781fffa6a2f66f915ea':
  Fix deadlocks.
2014-12-04 16:17:15 +00:00
Elliott Hughes fa969cd1f9 am 023bc0a4: Merge "Fix deadlocks."
* commit '023bc0a426d0500904d5a9d2ddf4b7dfecf9ce6a':
  Fix deadlocks.
2014-12-04 09:22:00 +00:00
Elliott Hughes 6855af4135 Merge "libpixelflinger should #define __ARM_HAVE_NEON." 2014-12-04 01:30:05 +00:00
Elliott Hughes 053ca3fc42 libpixelflinger should #define __ARM_HAVE_NEON.
Bug: 18556103
Change-Id: Ife07cf63948f1c248bcde5685cdb6d89c373d988
2014-12-03 17:15:14 -08:00
Elliott Hughes 023bc0a426 Merge "Fix deadlocks." 2014-12-03 18:38:05 +00:00
Dan Albert 052aff16ce am 96bc6841: am bc260206: Merge "Fix build."
* commit '96bc6841240d09050ef336461b9a13792f8080ed':
  Fix build.
2014-11-28 21:13:03 +00:00
Dan Albert 96bc684124 am bc260206: Merge "Fix build."
* commit 'bc2602068d83b0226a614ed143cebd708c5fabd2':
  Fix build.
2014-11-28 21:08:32 +00:00
Dan Albert bc2602068d Merge "Fix build." 2014-11-28 20:57:19 +00:00
Dan Albert fd1c060eaa Fix build.
More UD literals that weren't caught by hammerhead...

Change-Id: I6b0abdeef41d1f40c2fe86843b5149925ff6356e
2014-11-28 12:30:46 -08:00
Elliott Hughes e68b4ef9b9 am a03656d8: resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aosp
* commit 'a03656d884ff06e2e1894ba33cb3cc9afe58cf4e':
  Lose readlink to toybox.
2014-11-27 19:35:22 +00:00
Elliott Hughes a03656d884 resolved conflicts for merge of 809965cc to lmp-mr1-dev-plus-aosp
Change-Id: Ifbfe91b16e44b2acd08de48a5cdd2176bd664d0a
2014-11-27 11:31:06 -08:00
Elliott Hughes 809965cc36 Merge "Lose readlink to toybox." 2014-11-27 19:06:18 +00:00
Stephen Hines 622a75d5ab am fafbd329: am ba1552bd: Merge "Clarify the strcmp() with the empty string."
* commit 'fafbd329cb1685dc91172230a0671175e80ca8b3':
  Clarify the strcmp() with the empty string.
2014-11-27 14:01:26 +00:00
Stephen Hines d97d6d524a am 8d49c8b0: am f66486ef: Merge "Fix incorrect path name check."
* commit '8d49c8b0bfdc7bed855acec603bacc355b5bcb8c':
  Fix incorrect path name check.
2014-11-27 14:01:25 +00:00
Stephen Hines fafbd329cb am ba1552bd: Merge "Clarify the strcmp() with the empty string."
* commit 'ba1552bd2438a8a47779ed3d05d5ce15bfb5741c':
  Clarify the strcmp() with the empty string.
2014-11-27 13:54:31 +00:00
Stephen Hines 8d49c8b0bf am f66486ef: Merge "Fix incorrect path name check."
* commit 'f66486ef09bfc53da65ca6b4137c47d583f31356':
  Fix incorrect path name check.
2014-11-27 13:54:24 +00:00
Elliott Hughes f5b3875c98 am 330d8927: am b553a18a: Merge "Lose dmesg to toybox."
* commit '330d89278262c9fac0bf9be82dc03621daa9faa6':
  Lose dmesg to toybox.
2014-11-27 12:08:28 +00:00
Elliott Hughes 330d892782 am b553a18a: Merge "Lose dmesg to toybox."
* commit 'b553a18a02cd90298716c88d9167f877b63a36b6':
  Lose dmesg to toybox.
2014-11-27 12:01:22 +00:00
Elliott Hughes 0085d948f2 Lose readlink to toybox.
Change-Id: I933542dfdec7693f856d7368ff5661957ccabf74
2014-11-26 15:19:47 -08:00
Stephen Hines ba1552bd24 Merge "Clarify the strcmp() with the empty string." 2014-11-26 22:58:02 +00:00
Stephen Hines 04f895314d Clarify the strcmp() with the empty string.
Change-Id: Ie246b3c2de3f19b95693f634b0ebd46bdcf3962b
2014-11-26 14:54:43 -08:00
Stephen Hines f66486ef09 Merge "Fix incorrect path name check." 2014-11-26 22:32:23 +00:00
Stephen Hines 60f21a7f61 Fix incorrect path name check.
This was caught by clang 3.6's -Wpointer-bool-conversion. The device_path
field is a char[256], and thus never NULL. The intention for this code was
to check whether or not there is a named path at all. Checking whether this
is an empty string matches the original intent.

Change-Id: I5ccedc03167e6a457e472089de26130aff7f96e3
2014-11-26 14:30:01 -08:00
Elliott Hughes b553a18a02 Merge "Lose dmesg to toybox." 2014-11-26 19:37:30 +00:00
Eric Laurent 4fc62bdba5 am be7bb900: am 47f52f24: audio: new stream types
* commit 'be7bb9004c8663d145b998b6a6a349cb136dd6ae':
  audio: new stream types
2014-11-26 12:10:03 +00:00
Eric Laurent be7bb9004c am 47f52f24: audio: new stream types
* commit '47f52f247d6d895878b831de448f19b98225515d':
  audio: new stream types
2014-11-26 12:01:50 +00:00
Elliott Hughes b75528a9ec am a7ec5f10: am 50ac7725: Merge "Lose nohup to toybox."
* commit 'a7ec5f1067d640be206bf597a67c64750b8a1fef':
  Lose nohup to toybox.
2014-11-26 02:08:23 +00:00
Elliott Hughes a7ec5f1067 am 50ac7725: Merge "Lose nohup to toybox."
* commit '50ac7725a5f1c195989888277341f22ab54f979b':
  Lose nohup to toybox.
2014-11-26 02:03:41 +00:00
Elliott Hughes 50ac7725a5 Merge "Lose nohup to toybox." 2014-11-26 01:09:43 +00:00
Elliott Hughes 402f7e97d5 Lose nohup to toybox.
Change-Id: I2928534bc70c6c77cdc90b658029567f00e7f6ad
2014-11-25 16:58:53 -08:00
Elliott Hughes 8e8cd0cf7a Lose dmesg to toybox.
Change-Id: I29a6bf5e628e29e9b635fac2b23106220e36d6a3
2014-11-25 16:23:15 -08:00
Elliott Hughes c0c822c182 am bbd3b7ed: am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."
* commit 'bbd3b7edd7d2871e2327250219bb70e7c653e63d':
  Only Windows doesn't have <sys/uio.h>.
2014-11-25 22:01:48 +00:00
Elliott Hughes bbd3b7edd7 am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
  Only Windows doesn't have <sys/uio.h>.
2014-11-25 21:55:37 +00:00
Elliott Hughes c0ac9313e9 Merge "Only Windows doesn't have <sys/uio.h>." 2014-11-25 21:48:30 +00:00
Elliott Hughes 111e3d3d9c Only Windows doesn't have <sys/uio.h>.
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.

Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
2014-11-25 13:27:43 -08:00
Elliott Hughes 8dbb6a06c9 am f11758bb: am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."
* commit 'f11758bb58af4241817b0b374f913b39d1f32e44':
  Only Win32 doesn't have writev.
2014-11-25 20:03:46 +00:00
Andreas Gampe 58b80be811 am fcb2f0ab: am 0b7e6516: Merge "Libion: Remove unused variables"
* commit 'fcb2f0abe07ffd1c7a87bdcd7878a556ce0049fb':
  Libion: Remove unused variables
2014-11-25 20:03:45 +00:00
Andreas Gampe da8edff7ed am 45f2b924: am 705accc2: Merge "Init: Remove unused variables"
* commit '45f2b924b653c485b18204ae84747000c02ddcf6':
  Init: Remove unused variables
2014-11-25 20:03:44 +00:00
Andreas Gampe 601b627905 am d56b3ad7: am bac1dfa8: Merge "Lmkd: Fix unused variables"
* commit 'd56b3ad7b983ae055fabfa1035e9be6c4c2fa16a':
  Lmkd: Fix unused variables
2014-11-25 20:03:43 +00:00
Andreas Gampe 1442fae44a am 01334e52: am 1690b49e: Merge "Libsuspend: Remove unused variable"
* commit '01334e5241188a7f5ee2e1ac62431ce3e69d65c6':
  Libsuspend: Remove unused variable
2014-11-25 20:03:42 +00:00
Andreas Gampe 906ee0d757 am 38c3386a: resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp
* commit '38c3386a6cd44789f540fb9700c284345e7269e3':
  Healthd: Remove unused variables
2014-11-25 20:03:41 +00:00
Elliott Hughes f11758bb58 am 9c7e5c7c: Merge "Only Win32 doesn\'t have writev."
* commit '9c7e5c7c33607fce4c91e22dcf38237256450b9a':
  Only Win32 doesn't have writev.
2014-11-25 19:58:38 +00:00
Andreas Gampe fcb2f0abe0 am 0b7e6516: Merge "Libion: Remove unused variables"
* commit '0b7e651615b9b01b9f3f94b6fb1dcfbbbd02c72b':
  Libion: Remove unused variables
2014-11-25 19:58:36 +00:00
Andreas Gampe 45f2b924b6 am 705accc2: Merge "Init: Remove unused variables"
* commit '705accc2a3e3ab29308454212a6029821426ef4e':
  Init: Remove unused variables
2014-11-25 19:58:27 +00:00