OSDN Git Service

android-x86/frameworks-native.git
8 years agoMerge "inputflinger: Initial support for rotary encoders." into cw-e-dev am: 68fca5a1...
Prashant Malani [Tue, 8 Dec 2015 01:36:18 +0000 (01:36 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am: 68fca5a176 am: e50ab08fd6
am: b7b7fa1769

* commit 'b7b7fa1769b6a13461705309659846e99deb8cf2':
  inputflinger: Initial support for rotary encoders.

8 years agoMerge "inputflinger: Initial support for rotary encoders." into cw-e-dev am: 68fca5a176
Prashant Malani [Tue, 8 Dec 2015 01:33:04 +0000 (01:33 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am: 68fca5a176
am: e50ab08fd6

* commit 'e50ab08fd676c78bc1d826dc2172cf370feb54c0':
  inputflinger: Initial support for rotary encoders.

8 years agoMerge "inputflinger: Initial support for rotary encoders." into cw-e-dev
Prashant Malani [Tue, 8 Dec 2015 01:30:53 +0000 (01:30 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
am: 68fca5a176

* commit '68fca5a1763203164a19a9aa983895242a671387':
  inputflinger: Initial support for rotary encoders.

8 years agoMerge "inputflinger: Initial support for rotary encoders." into cw-e-dev
Prashant Malani [Tue, 8 Dec 2015 01:27:17 +0000 (01:27 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev

8 years agoMerge "Replace libGLESv3 symlink with shared library" am: 18ff655766
Dimitry Ivanov [Mon, 7 Dec 2015 23:39:17 +0000 (23:39 +0000)]
Merge "Replace libGLESv3 symlink with shared library" am: 18ff655766
am: bc432368f4

* commit 'bc432368f410d628d21435c9f8fbcdf6bb68ef95':
  Replace libGLESv3 symlink with shared library

8 years agoMerge "Replace libGLESv3 symlink with shared library"
Dimitry Ivanov [Mon, 7 Dec 2015 23:16:20 +0000 (23:16 +0000)]
Merge "Replace libGLESv3 symlink with shared library"
am: 18ff655766

* commit '18ff6557667f3d130ad1f83e04f3b175f8b8cf6d':
  Replace libGLESv3 symlink with shared library

8 years agoMerge "Replace libGLESv3 symlink with shared library"
Dimitry Ivanov [Mon, 7 Dec 2015 19:00:58 +0000 (19:00 +0000)]
Merge "Replace libGLESv3 symlink with shared library"

8 years agoMerge "Revert "libbinder: Don\'t redefine B_PACK_CHARS"" am: 3f46d82d7b
Bart Sears [Sat, 5 Dec 2015 03:45:09 +0000 (03:45 +0000)]
Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS"" am: 3f46d82d7b
am: 9bb03731ee

* commit '9bb03731ee1f01abbc193a75ea08d632fbb2f81b':
  Revert "libbinder: Don't redefine B_PACK_CHARS"

8 years agoMerge "Revert "libbinder: Don\'t redefine B_PACK_CHARS""
Bart Sears [Sat, 5 Dec 2015 03:42:14 +0000 (03:42 +0000)]
Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS""
am: 3f46d82d7b

* commit '3f46d82d7b8ee0ae6295723311e5c986b649d727':
  Revert "libbinder: Don't redefine B_PACK_CHARS"

8 years agoMerge "Revert "libbinder: Don't redefine B_PACK_CHARS""
Bart Sears [Sat, 5 Dec 2015 03:38:59 +0000 (03:38 +0000)]
Merge "Revert "libbinder: Don't redefine B_PACK_CHARS""

8 years agoRevert "libbinder: Don't redefine B_PACK_CHARS"
Bart Sears [Sat, 5 Dec 2015 03:38:34 +0000 (03:38 +0000)]
Revert "libbinder: Don't redefine B_PACK_CHARS"

This reverts commit 3eab1b40acbcc2e82b3e90da26706129019eccf9.

Change-Id: Iedc99961c6014029722f814e621970c1732f9092

8 years agoMerge "Track rename from base/ to android-base/." am: f31cf3ab0f
Elliott Hughes [Sat, 5 Dec 2015 01:45:35 +0000 (01:45 +0000)]
Merge "Track rename from base/ to android-base/." am: f31cf3ab0f
am: c21980bc12

* commit 'c21980bc12db67c763a18b1abaa3ddd3689b1687':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Sat, 5 Dec 2015 01:39:36 +0000 (17:39 -0800)]
Merge "Track rename from base/ to android-base/."
am: f31cf3ab0f

* commit 'f31cf3ab0f53394200c0f22a4591db741ba1ccb0':
  Track rename from base/ to android-base/.

8 years agoMerge "Track rename from base/ to android-base/."
Elliott Hughes [Sat, 5 Dec 2015 01:33:52 +0000 (01:33 +0000)]
Merge "Track rename from base/ to android-base/."

8 years agoMerge "libbinder: Don\'t redefine B_PACK_CHARS" am: 7166e7823c
Christopher Wiley [Sat, 5 Dec 2015 00:23:13 +0000 (00:23 +0000)]
Merge "libbinder: Don\'t redefine B_PACK_CHARS" am: 7166e7823c
am: a1474da3b5

* commit 'a1474da3b5a521c2f33494b4a83e50841a399c15':
  libbinder: Don't redefine B_PACK_CHARS

8 years agoMerge "libbinder: Don\'t redefine B_PACK_CHARS"
Christopher Wiley [Sat, 5 Dec 2015 00:20:15 +0000 (16:20 -0800)]
Merge "libbinder: Don\'t redefine B_PACK_CHARS"
am: 7166e7823c

* commit '7166e7823cedb817f0278f569940aa86f424aa3b':
  libbinder: Don't redefine B_PACK_CHARS

8 years agoMerge "libbinder: Don't redefine B_PACK_CHARS"
Christopher Wiley [Sat, 5 Dec 2015 00:15:12 +0000 (00:15 +0000)]
Merge "libbinder: Don't redefine B_PACK_CHARS"

8 years agolibbinder: Don't redefine B_PACK_CHARS
Christopher Wiley [Fri, 4 Dec 2015 22:15:27 +0000 (14:15 -0800)]
libbinder: Don't redefine B_PACK_CHARS

This macro is defined in linux/binder.h which is *sometimes* included
before binder/IBinder.h depending on codepath.

Bug: 25868260
Test: Compiles

Change-Id: Ied1e6658936668c16cbdacab3a3205107c907655

8 years agoTrack rename from base/ to android-base/.
Elliott Hughes [Fri, 4 Dec 2015 23:39:32 +0000 (15:39 -0800)]
Track rename from base/ to android-base/.

Change-Id: I62c18891ffe319d20ff084f5ca2aa0c038c23cd3

8 years agoMerge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev am...
Martijn Coenen [Fri, 4 Dec 2015 22:16:54 +0000 (14:16 -0800)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev am: e902acb2ec
am: 6a6aa6f855

* commit '6a6aa6f855dd8624d830423edd2e4582e54dcc97':
  DO NOT MERGE: add support for new sched tracepoint

8 years agoMerge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
Martijn Coenen [Fri, 4 Dec 2015 09:34:50 +0000 (01:34 -0800)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
am: e902acb2ec

* commit 'e902acb2ec74bc1b3cbf2359283e3bd9eccd88e9':
  DO NOT MERGE: add support for new sched tracepoint

8 years agoMerge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
Martijn Coenen [Fri, 4 Dec 2015 09:31:34 +0000 (09:31 +0000)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev

8 years agoMerge "libbinder: Handle transaction failures correctly" am: 823fa55aec
Christopher Wiley [Thu, 3 Dec 2015 21:26:58 +0000 (21:26 +0000)]
Merge "libbinder: Handle transaction failures correctly" am: 823fa55aec
am: 302abd03b6

* commit '302abd03b6db600c41b353213002ba552b3e0097':
  libbinder: Handle transaction failures correctly

8 years agoMerge "libbinder: Handle transaction failures correctly"
Christopher Wiley [Thu, 3 Dec 2015 21:21:21 +0000 (21:21 +0000)]
Merge "libbinder: Handle transaction failures correctly"
am: 823fa55aec

* commit '823fa55aec55684605e6f4c764ec20901066553c':
  libbinder: Handle transaction failures correctly

8 years agoMerge "libbinder: Handle transaction failures correctly"
Christopher Wiley [Thu, 3 Dec 2015 21:17:42 +0000 (21:17 +0000)]
Merge "libbinder: Handle transaction failures correctly"

8 years agolibbinder: Handle transaction failures correctly
Christopher Wiley [Mon, 23 Nov 2015 00:29:58 +0000 (16:29 -0800)]
libbinder: Handle transaction failures correctly

Java code expects status_t != OK to be caught at the JNI level in
android_util_Binder.cpp (see signalExceptionForError).  We were
incorrectly mapping this kind of failure to a special exception type
and writing that exception type to parcels.

Instead, refuse to write EX_TRANSACTION_FAILED to a parcel and return
the status value instead.

While here, remove non-trivial constructors to push authors toward the
more explicit factory methods.  Remove getException() and push authors
toward using the simpler getter methods. Fix minor camelCase issues.

Bug: 25615695
Test: system/tools/aidl integration tests still pass

Change-Id: I7cad3ac8ae8300b5ac0b466606f4934d01e503c5

8 years agoMerge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBU...
Dan Stoza [Wed, 2 Dec 2015 18:37:54 +0000 (18:37 +0000)]
Merge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3" am: b2e3095a60
am: 46f8beb07f

* commit '46f8beb07fe2fa28b1c216485b91b894a1c8625b':
  bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

8 years agoMerge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBU...
Dan Stoza [Wed, 2 Dec 2015 18:34:06 +0000 (18:34 +0000)]
Merge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3"
am: b2e3095a60

* commit 'b2e3095a604e16d5d80d1e3d38bb92a6c37bd127':
  bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

8 years agoMerge "bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUF...
Dan Stoza [Wed, 2 Dec 2015 18:27:05 +0000 (18:27 +0000)]
Merge "bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3"

8 years agobug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SUR...
james.zhang [Tue, 1 Dec 2015 09:55:11 +0000 (17:55 +0800)]
bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3

[root cause  ] framebuffer surface is in the same process of surface flinger
[changes     ] call IGraphicBufferProducer::allocateBuffers on producer inside the DisplayDevice constructor to force-allocate all three buffers.
[side effects] none
[self test   ]<tshark, enter and exit mainmenu>: ok
[reviewers   ] zhongjun.chen
[change_type ] AOB --> google_original
[tag_product ] common

Change-Id: Ideb75d3aa1ed23b2fa4d263a120ea3ca39d01361

8 years agoRevert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am: 8c3e55f...
Ben Fennema [Wed, 2 Dec 2015 01:19:39 +0000 (01:19 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am: 8c3e55f414  -s ours am: da3af0896f  -s ours
am: 4c3e4c6f14  -s ours

* commit '4c3e4c6f1494643c60408eaf516791b2f3b1585c':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoRevert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am: 8c3e55f...
Ben Fennema [Wed, 2 Dec 2015 01:15:00 +0000 (01:15 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am: 8c3e55f414  -s ours
am: da3af0896f  -s ours

* commit 'da3af0896f8415425b7ca75cd1ec28f31a377a15':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoRevert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:11:29 +0000 (01:11 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
am: 8c3e55f414  -s ours

* commit '8c3e55f4149deda3ec7c7a67fda81216d5f9af25':
  Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

8 years agoRevert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:04:40 +0000 (01:04 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"

This reverts commit d4db70a7b8b2d136c46c50f89b276f8150be5fc2.

Change-Id: Ifb52d5595970a5178e12c2a90da4aac0e38f5942

8 years agoDO NOT MERGE ANYWHERE Add new interface for sensor physical data am: d4db70a7b8 ...
Jani Suonpera [Wed, 2 Dec 2015 00:33:44 +0000 (00:33 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am: d4db70a7b8  -s ours am: 37f1300ffc  -s ours
am: e51ffd15e9  -s ours

* commit 'e51ffd15e918543edf255d96822a0d371895feda':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoDO NOT MERGE ANYWHERE Add new interface for sensor physical data am: d4db70a7b8 ...
Jani Suonpera [Wed, 2 Dec 2015 00:29:43 +0000 (00:29 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am: d4db70a7b8  -s ours
am: 37f1300ffc  -s ours

* commit '37f1300ffc5a8712cbfc76910b9cfb3308dd75ca':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoDO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:25:47 +0000 (00:25 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
am: d4db70a7b8  -s ours

* commit 'd4db70a7b8b2d136c46c50f89b276f8150be5fc2':
  DO NOT MERGE ANYWHERE Add new interface for sensor physical data

8 years agoDO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Fri, 9 Oct 2015 08:45:57 +0000 (11:45 +0300)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data

This is special solution only for emerald branch.

Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.

Change-Id: I3abc3ddc7c6adc4b32a40b9a43f2a94c5af7b2b0
Signed-off-by: Ben Fennema <fennema@google.com>
8 years agoIncrease raft timeout to 10min so we get complete logs from older devices. am: 804339...
Sharvil Nanavati [Mon, 30 Nov 2015 21:15:51 +0000 (21:15 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices. am: 804339a59e am: 7126caa17f
am: c3ee5e8fb9

* commit 'c3ee5e8fb94e1af7338e4217afb3365531ae0309':
  Increase raft timeout to 10min so we get complete logs from older devices.

8 years agoIncrease raft timeout to 10min so we get complete logs from older devices. am: 804339a59e
Sharvil Nanavati [Mon, 30 Nov 2015 21:11:38 +0000 (21:11 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices. am: 804339a59e
am: 7126caa17f

* commit '7126caa17f4b76632335daa8090ba9e37db35102':
  Increase raft timeout to 10min so we get complete logs from older devices.

8 years agoIncrease raft timeout to 10min so we get complete logs from older devices.
Sharvil Nanavati [Mon, 30 Nov 2015 21:07:46 +0000 (21:07 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices.
am: 804339a59e

* commit '804339a59e4abcbcf5a50a60ff0543e6b404e572':
  Increase raft timeout to 10min so we get complete logs from older devices.

8 years agoDO NOT MERGE: add support for new sched tracepoint
Tim Murray [Mon, 30 Nov 2015 18:59:55 +0000 (10:59 -0800)]
DO NOT MERGE: add support for new sched tracepoint

This tracepoint gives systrace the means to display the reason
for uninterruptible sleep.

bug 23350688

Change-Id: I9ee5b6904c27bcb5bd67c86fda66d45d0a3c0999

8 years agoMerge "Atrace: support streaming data to stdout." am: 83a98b101c
Martijn Coenen [Mon, 30 Nov 2015 18:58:32 +0000 (18:58 +0000)]
Merge "Atrace: support streaming data to stdout." am: 83a98b101c
am: 78d4fb8e77

* commit '78d4fb8e771f85f6d7f04f6c0eb7aed1992b3a43':
  Atrace: support streaming data to stdout.

8 years agoMerge "Atrace: support streaming data to stdout."
Martijn Coenen [Mon, 30 Nov 2015 18:55:48 +0000 (18:55 +0000)]
Merge "Atrace: support streaming data to stdout."
am: 83a98b101c

* commit '83a98b101c2850a936c0e612e4eb16d815db025e':
  Atrace: support streaming data to stdout.

8 years agoMerge "Atrace: support streaming data to stdout."
Martijn Coenen [Mon, 30 Nov 2015 18:51:11 +0000 (18:51 +0000)]
Merge "Atrace: support streaming data to stdout."

8 years agoAtrace: support streaming data to stdout.
Martijn Coenen [Thu, 26 Nov 2015 09:00:55 +0000 (10:00 +0100)]
Atrace: support streaming data to stdout.

Change-Id: I8534a9c69f25ecdd82230a5d8b4b8d1c4d58439e

8 years agoIncrease raft timeout to 10min so we get complete logs from older devices.
Sharvil Nanavati [Sat, 28 Nov 2015 05:04:11 +0000 (21:04 -0800)]
Increase raft timeout to 10min so we get complete logs from older devices.

Devices like dory get slammed when bugreports are taken and can't
compress all the raft logs in the current 5min timeout. Our dogfooders
spend their precious time getting us bugreports and then we can't act
on them because we have broken raft logs. :(

This change bumps up the timeout in the hopes that we can get complete
logs from even our slowest devices.

Change-Id: I10741a6185b39544f4c0531f0ee74864d74a1aa4

8 years agoMerge "Add support for file descriptors and vectors thereof" am: 8f237272e0
Casey Dahlin [Mon, 23 Nov 2015 22:37:27 +0000 (22:37 +0000)]
Merge "Add support for file descriptors and vectors thereof" am: 8f237272e0
am: 0ebbd1ef19

* commit '0ebbd1ef19a4a4f6b0dfcc8d8d7c625ab5211f9d':
  Add support for file descriptors and vectors thereof

8 years agoMerge "Add support for file descriptors and vectors thereof"
Casey Dahlin [Mon, 23 Nov 2015 22:33:15 +0000 (22:33 +0000)]
Merge "Add support for file descriptors and vectors thereof"
am: 8f237272e0

* commit '8f237272e0630b8f279db7f90aebfff73a1a9c00':
  Add support for file descriptors and vectors thereof

8 years agoMerge "Add support for file descriptors and vectors thereof"
Casey Dahlin [Mon, 23 Nov 2015 22:22:45 +0000 (22:22 +0000)]
Merge "Add support for file descriptors and vectors thereof"

8 years agoAdd support for file descriptors and vectors thereof
Casey Dahlin [Mon, 23 Nov 2015 21:24:23 +0000 (13:24 -0800)]
Add support for file descriptors and vectors thereof

We use ScopedFd from nativehelper to manage the lifetime.

Test: Passes AIDL unit and integration tests. Full build completes and
      runs.
Bug: 25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
Change-Id: I22c87ed1cb3bd4bf667b372ea4a2e9fcd4dd986a

8 years agoMerge "libbinder: Add support for C++ Parcelable" am: 49b5443a49
Christopher Wiley [Mon, 23 Nov 2015 18:23:09 +0000 (18:23 +0000)]
Merge "libbinder: Add support for C++ Parcelable" am: 49b5443a49
am: 6c31acd969

* commit '6c31acd969ffc754e514885fa7f4d0c25403f580':
  libbinder: Add support for C++ Parcelable

8 years agoMerge "libbinder: Add support for C++ Parcelable"
Christopher Wiley [Mon, 23 Nov 2015 18:19:16 +0000 (18:19 +0000)]
Merge "libbinder: Add support for C++ Parcelable"
am: 49b5443a49

* commit '49b5443a49d737d13c8d05dfd9b827b2c4198edc':
  libbinder: Add support for C++ Parcelable

8 years agoMerge "libbinder: Add support for C++ Parcelable"
Christopher Wiley [Mon, 23 Nov 2015 18:14:26 +0000 (18:14 +0000)]
Merge "libbinder: Add support for C++ Parcelable"

8 years agoMerge "libbinder: Move vector writing templates to header" am: e1aa1c7e13
Christopher Wiley [Fri, 20 Nov 2015 22:33:00 +0000 (22:33 +0000)]
Merge "libbinder: Move vector writing templates to header" am: e1aa1c7e13
am: 709ae9a0a5

* commit '709ae9a0a5775c75b81d011ae9624f28787e5b15':
  libbinder: Move vector writing templates to header

8 years agoMerge "libbinder: Move vector writing templates to header"
Christopher Wiley [Fri, 20 Nov 2015 22:29:38 +0000 (22:29 +0000)]
Merge "libbinder: Move vector writing templates to header"
am: e1aa1c7e13

* commit 'e1aa1c7e136e7372c17b8db7a6d8b307ba4cd571':
  libbinder: Move vector writing templates to header

8 years agoMerge "libbinder: Move vector writing templates to header"
Christopher Wiley [Fri, 20 Nov 2015 22:25:48 +0000 (22:25 +0000)]
Merge "libbinder: Move vector writing templates to header"

8 years agodumpstate: add -v printable to logcat
Mark Salyzyn [Fri, 20 Nov 2015 18:58:10 +0000 (18:58 +0000)]
dumpstate: add -v printable to logcat
am: f83543ab9d

* commit 'f83543ab9d466b5d5ccfa7546e4d752a1d18f3d5':
  dumpstate: add -v printable to logcat

8 years agodumpstate: add -v printable to logcat
Mark Salyzyn [Fri, 9 Oct 2015 21:02:07 +0000 (14:02 -0700)]
dumpstate: add -v printable to logcat

(cherry pick from commit 7831638e2a142cbb082d63a60ad5c04ff63933e8)

In the case where binary data lands in an utf-8 log buffer,
ensure that the content is made printable.

Bug: 23517551
Change-Id: I41696372d07228875d01a19f0c7ab2cb7494b7ef

8 years agoMerge commit '6e361344fda22c98a36c596819470a699896dcac' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:56 +0000 (15:41 -0800)]
Merge commit '6e361344fda22c98a36c596819470a699896dcac' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit 'ddfe7bd8b89673473f77f927c3464e7de0d83baf' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:54 +0000 (15:41 -0800)]
Merge commit 'ddfe7bd8b89673473f77f927c3464e7de0d83baf' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '32d29a534b0ed403230c2f213e9391d8ce76318c' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:52 +0000 (15:41 -0800)]
Merge commit '32d29a534b0ed403230c2f213e9391d8ce76318c' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '6264c4c194e0bbcd060409e0e8c0abfaae3bdf10' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:48 +0000 (15:41 -0800)]
Merge commit '6264c4c194e0bbcd060409e0e8c0abfaae3bdf10' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:45 +0000 (15:41 -0800)]
Merge commit '3e4b6d219f1f015cdf16a5ae750acd8050d7d9d9' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '714a3ab7ae00f768a92f213119181a7422342c8a' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:42 +0000 (15:41 -0800)]
Merge commit '714a3ab7ae00f768a92f213119181a7422342c8a' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '930a572ec310359844d2ab184de85b1ecf1d58be' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:12 +0000 (15:41 -0800)]
Merge commit '930a572ec310359844d2ab184de85b1ecf1d58be' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '489931b6ce22434b943bdf8381b376f429b58633' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:11 +0000 (15:41 -0800)]
Merge commit '489931b6ce22434b943bdf8381b376f429b58633' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '210648c40e7c2001cc2a52df532a6ae8f89ac029' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:08 +0000 (15:41 -0800)]
Merge commit '210648c40e7c2001cc2a52df532a6ae8f89ac029' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit 'a5bcc9590a76c2ec0be5a6e8d1db8d8a69d80753' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:06 +0000 (15:41 -0800)]
Merge commit 'a5bcc9590a76c2ec0be5a6e8d1db8d8a69d80753' into mnc-dr2-dev-plus-aosp

8 years agoMerge commit '08bb145a3c82d86ee26d3c567a929a2db41d9101' into mnc-dr2-dev-plus-aosp
Qiwen Zhao [Thu, 19 Nov 2015 23:41:04 +0000 (15:41 -0800)]
Merge commit '08bb145a3c82d86ee26d3c567a929a2db41d9101' into mnc-dr2-dev-plus-aosp

8 years agoAdd methods to Parcel for bool and char and byte
Casey Dahlin [Thu, 19 Nov 2015 23:32:45 +0000 (23:32 +0000)]
Add methods to Parcel for bool and char and byte
am: a377491405  -s ours

* commit 'a37749140585cd76178a93faf3abd27cd2fc30dc':
  Add methods to Parcel for bool and char and byte

8 years agohandle size_t > java max int size
Nick Kralevich [Thu, 19 Nov 2015 23:23:53 +0000 (23:23 +0000)]
handle size_t > java max int size
am: cfe27deac7

* commit 'cfe27deac7e0ede89a78b9f03fb4a4159d68be8e':
  handle size_t > java max int size

8 years agoBenign unsigned integer overflow in Parcel
Dan Austin [Thu, 19 Nov 2015 23:23:48 +0000 (23:23 +0000)]
Benign unsigned integer overflow in Parcel
am: f28b295df9

* commit 'f28b295df90da3b9610cc5d6100039e54d95f49a':
  Benign unsigned integer overflow in Parcel

8 years agobinder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Bailey Forrest [Thu, 19 Nov 2015 23:23:43 +0000 (23:23 +0000)]
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
am: 2ab8014d78

* commit '2ab8014d78fe89b022cd8f69024112780fecdd30':
  binder: Change from C11 <stdatomic.h> to C++11 <atomic>.

8 years agoMerge "Add support for new sched kernel tracepoint" am: 61c9506a09
Riley Andrews [Thu, 19 Nov 2015 22:12:12 +0000 (22:12 +0000)]
Merge "Add support for new sched kernel tracepoint" am: 61c9506a09
am: 31a851cd75

* commit '31a851cd7580d6babdc011b3f50da760e7e4274a':
  Add support for new sched kernel tracepoint

8 years agoMerge "Add support for new sched kernel tracepoint"
Riley Andrews [Thu, 19 Nov 2015 22:06:48 +0000 (22:06 +0000)]
Merge "Add support for new sched kernel tracepoint"
am: 61c9506a09

* commit '61c9506a09959ae07832cc019818f869403d3f2a':
  Add support for new sched kernel tracepoint

8 years agoMerge "Add support for new sched kernel tracepoint"
Riley Andrews [Thu, 19 Nov 2015 22:05:29 +0000 (22:05 +0000)]
Merge "Add support for new sched kernel tracepoint"

8 years agoAdd support for new sched kernel tracepoint
Riley Andrews [Thu, 19 Nov 2015 21:31:17 +0000 (13:31 -0800)]
Add support for new sched kernel tracepoint

This tracepoint gives systrace the means to display the reason
for uninterruptible sleep.

8 years agoAllow using the JIT
Todd Kennedy [Thu, 19 Nov 2015 19:15:38 +0000 (19:15 +0000)]
Allow using the JIT
am: 806313fe81  -s ours

* commit '806313fe8168fe7e68c21a839966fd6c31ec8189':
  Allow using the JIT

8 years agoPass dexopt flags as integer
Todd Kennedy [Thu, 19 Nov 2015 18:54:20 +0000 (18:54 +0000)]
Pass dexopt flags as integer
am: 90907aca73  -s ours

* commit '90907aca732cf5cbb80cc95993f2401857254069':
  Pass dexopt flags as integer

8 years agobatteryservice: Add max charging voltage
Badhri Jagan Sridharan [Thu, 19 Nov 2015 16:30:45 +0000 (16:30 +0000)]
batteryservice: Add max charging voltage
am: 4e5a5adda8

* commit '4e5a5adda807cec54df8c1f2ccf51830abe9b4e2':
  batteryservice: Add max charging voltage

8 years agolibbinder: Add binder::Status type
Christopher Wiley [Mon, 9 Nov 2015 23:06:15 +0000 (15:06 -0800)]
libbinder: Add binder::Status type

(cherry-pick of 09eb749704afd9e226e1347cb20c90be2016cd21)

This object implements equivalent functionality to the Java logic which
serializes and re-throws exceptions from services.

Bug: 25615695
Test: Integration test for generated AIDL code reveals this to work
      correctly.

Change-Id: I5a57710a148ffbd18a4a2c6f0f4fb6d409e0bf8f

8 years agolibbinder: Add support for C++ Parcelable
Christopher Wiley [Thu, 19 Nov 2015 14:49:05 +0000 (06:49 -0800)]
libbinder: Add support for C++ Parcelable

Bug: 23600712
Test: compiles, integration tests for Java/C++ compatibility pass

Change-Id: I0919571919a3633350169ed5668bbb000da9691c

8 years agolibbinder: Move vector writing templates to header
Christopher Wiley [Thu, 19 Nov 2015 14:42:40 +0000 (06:42 -0800)]
libbinder: Move vector writing templates to header

This allows us to reuse them to read and write vectors of parcelables.

Bug: 23600712
Test: Compiles, aidl integration tests pass

Change-Id: Ibbfc2f158b6b3000b13f35f3c09a0cd3741e8128

8 years agoReplace libGLESv3 symlink with shared library
Dmitriy Ivanov [Wed, 18 Nov 2015 22:57:49 +0000 (14:57 -0800)]
Replace libGLESv3 symlink with shared library

Because of the link to libGLESv2.so, libGLESv3.so had
incorrect dt_soname, which led to inability to use
in in linker public namespaces.

This change replaces symlink with shared library.

Bug: http://b/25754041
Change-Id: I3743c81f05bc6caf746e40ef7531723e97632a70

8 years agoSet cpuset from surfaceflinger.
Tim Murray [Wed, 18 Nov 2015 22:56:03 +0000 (22:56 +0000)]
Set cpuset from surfaceflinger.
am: 392db573b3

* commit '392db573b35d6fe09c4da094ed81c54ed528a511':
  Set cpuset from surfaceflinger.

8 years agoMerge "Revert "Add support for unique_fds and vectors of file descriptors"" am: 5cd09...
Casey Dahlin [Wed, 18 Nov 2015 21:48:42 +0000 (21:48 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors"" am: 5cd09786eb
am: fb92cfcd3e

* commit 'fb92cfcd3e8977a6cac0147de80bf2a0fb6a2d87':
  Revert "Add support for unique_fds and vectors of file descriptors"

8 years agoMerge "Revert "Add support for unique_fds and vectors of file descriptors""
Casey Dahlin [Wed, 18 Nov 2015 21:42:30 +0000 (21:42 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors""
am: 5cd09786eb

* commit '5cd09786eb4ff6e99351e8a317205a5efd12ac74':
  Revert "Add support for unique_fds and vectors of file descriptors"

8 years agoMerge "Revert "Add support for unique_fds and vectors of file descriptors""
Casey Dahlin [Wed, 18 Nov 2015 21:33:48 +0000 (21:33 +0000)]
Merge "Revert "Add support for unique_fds and vectors of file descriptors""

8 years agoRevert "Add support for unique_fds and vectors of file descriptors"
Casey Dahlin [Wed, 18 Nov 2015 21:30:02 +0000 (21:30 +0000)]
Revert "Add support for unique_fds and vectors of file descriptors"

This reverts commit 9626d88882972d45576dcceedc037d2e9843196b.

Change-Id: I6121f388d17c6f2d0cf6f31bc42f0804dd72aba2

8 years agoMerge "Add support for unique_fds and vectors of file descriptors" am: b1819fc295
Casey Dahlin [Wed, 18 Nov 2015 21:10:30 +0000 (21:10 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors" am: b1819fc295
am: 0dd1a5d2f4

* commit '0dd1a5d2f4e69c5df233fa9468191c03dc9b639f':
  Add support for unique_fds and vectors of file descriptors

8 years agoMerge "Add support for unique_fds and vectors of file descriptors"
Casey Dahlin [Wed, 18 Nov 2015 21:04:07 +0000 (21:04 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors"
am: b1819fc295

* commit 'b1819fc295811ca3a005042a80149c8d0655211f':
  Add support for unique_fds and vectors of file descriptors

8 years agoMerge "Add support for unique_fds and vectors of file descriptors"
Casey Dahlin [Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)]
Merge "Add support for unique_fds and vectors of file descriptors"

8 years agoActively mangage EAS schedtune nodes
Todd Kjos [Mon, 16 Nov 2015 23:49:50 +0000 (15:49 -0800)]
Actively mangage EAS schedtune nodes

Move foreground tasks to /sys/fs/cgroup/stune/boost/tasks (boosted
weight in EAS scheduler). Move background tasks to
/sys/fs/cgroup/stune/tasks (default weight). For services started
with init, set "foreground" services to boosted.

Change-Id: I0e489fad9510727c13e6754dabaf311c2391f395

8 years agoAdd support for unique_fds and vectors of file descriptors
Casey Dahlin [Thu, 5 Nov 2015 20:17:29 +0000 (12:17 -0800)]
Add support for unique_fds and vectors of file descriptors

Change-Id: Ic61e69d9db438b4686032459c896aed2a482c9a5
Test: Unit tests pass
Bug: 25242023
Signed-off-by: Casey Dahlin <sadmac@google.com>
8 years agoSet cpuset from surfaceflinger.
Tim Murray [Tue, 10 Nov 2015 22:29:45 +0000 (14:29 -0800)]
Set cpuset from surfaceflinger.

SurfaceFlinger shouldn't be limited to little cores exclusively, as the
binder threads should be placed on big cores when they are in the
critical path for a RenderThread.

bug 25745866

Change-Id: I9fb65f6d951733f91b4735ff27018411b58b2bfb

8 years agoMerge "libbinder: Add binder::Status type" am: babed3ea52
Christopher Wiley [Wed, 18 Nov 2015 16:30:45 +0000 (16:30 +0000)]
Merge "libbinder: Add binder::Status type" am: babed3ea52
am: d352198294

* commit 'd3521982942874f4149ebc686be581d0ff857734':
  libbinder: Add binder::Status type

8 years agoMerge "libbinder: Add binder::Status type"
Christopher Wiley [Wed, 18 Nov 2015 16:24:53 +0000 (16:24 +0000)]
Merge "libbinder: Add binder::Status type"
am: babed3ea52

* commit 'babed3ea523822f4f5084c3e8a951f2cdf924695':
  libbinder: Add binder::Status type

8 years agoMerge "libbinder: Add binder::Status type"
Christopher Wiley [Wed, 18 Nov 2015 16:18:30 +0000 (16:18 +0000)]
Merge "libbinder: Add binder::Status type"

8 years agoUse templates for write*Vector methods
Casey Dahlin [Fri, 13 Nov 2015 21:46:29 +0000 (13:46 -0800)]
Use templates for write*Vector methods

Test: AIDL integration tests still pass
Bug: None
Signed-off-by: Casey Dahlin <sadmac@google.com>
(cherry picked from commit 5f0625695ce6999ec70f5699f70a8a0fa84a1bf6)

Change-Id: I902dd90faa77cba7a2212793bd26a3cfe49fc443