OSDN Git Service
Andreas Gampe [Tue, 2 Dec 2014 18:47:20 +0000 (18:47 +0000)]
am
f8954c81: Merge "OpenGL tests: Fix unused variables"
* commit '
f8954c81a4ec43958867d1f6f497ef449bf091fd':
OpenGL tests: Fix unused variables
Andreas Gampe [Tue, 2 Dec 2014 18:24:56 +0000 (18:24 +0000)]
Merge "OpenGL tests: Fix unused variables"
Jesse Hall [Tue, 2 Dec 2014 00:42:23 +0000 (00:42 +0000)]
am
4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '
4aaa39358f538d8e06e026385bb8be8088d78c35':
Avoid overwriting EGL14.EGL_NO_SURFACE
Jesse Hall [Tue, 2 Dec 2014 00:34:50 +0000 (00:34 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
Dan Stoza [Mon, 1 Dec 2014 19:27:00 +0000 (19:27 +0000)]
am
80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"
* commit '
80e8150549c9d8380dadf942336d41ab3d92bf78':
binder: Add {read,write}Uint32 methods to Parcel
Dan Stoza [Mon, 1 Dec 2014 19:23:22 +0000 (19:23 +0000)]
am
104e1259: Merge "binder: Return pid_t/uid_t instead of int"
* commit '
104e12594e085bc8dd32eedb96643b774b1508a0':
binder: Return pid_t/uid_t instead of int
Dan Stoza [Mon, 1 Dec 2014 19:16:16 +0000 (19:16 +0000)]
Merge "binder: Add {read,write}Uint32 methods to Parcel"
Dan Stoza [Mon, 1 Dec 2014 18:01:10 +0000 (10:01 -0800)]
binder: Add {read,write}Uint32 methods to Parcel
Adds readUint32 and writeUint32 methods to the Parcel class. This
saves a lot of static_casting in anything implementing a Binder
interface on the native side.
Change-Id: Iafc73b0633654a3a4c49767f41806b56906c924f
Dan Stoza [Mon, 1 Dec 2014 19:10:58 +0000 (19:10 +0000)]
Merge "binder: Return pid_t/uid_t instead of int"
Dan Stoza [Wed, 26 Nov 2014 20:23:23 +0000 (12:23 -0800)]
binder: Return pid_t/uid_t instead of int
Makes IPCThreadState::getCalling{Pid,Uid} return a more
appropriate type.
Change-Id: I97f8a83c1c0722bc1afbf8a6df1a288f8f1f0d2c
Chih-hung Hsieh [Tue, 25 Nov 2014 23:55:52 +0000 (23:55 +0000)]
am
46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"
* commit '
46ca041f43e3d80029782b12c994b232dc01b5d5':
Don't error out because SensorEventConnection::dump overloads BBinder::dump
Chih-hung Hsieh [Tue, 25 Nov 2014 23:45:38 +0000 (23:45 +0000)]
Merge "Don't error out because SensorEventConnection::dump overloads BBinder::dump"
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:03:39 +0000 (21:03 +0100)]
Don't error out because SensorEventConnection::dump overloads BBinder::dump
clang warns about SensorEventConnection::dump overloading BBinder::dump
in some conditions.
Since the cause isn't fixable without changing the API, tell clang not
to error out on it.
Change-Id: I15659de7c5499d937019599cfefb01305039e6b5
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Chih-hung Hsieh [Tue, 25 Nov 2014 22:56:02 +0000 (22:56 +0000)]
am
2d7ec9d7: Merge "Fix build with clang in C++11 mode"
* commit '
2d7ec9d7b5dfdb93930b94c134fa2dc10fd27313':
Fix build with clang in C++11 mode
Chih-hung Hsieh [Tue, 25 Nov 2014 22:43:44 +0000 (22:43 +0000)]
Merge "Fix build with clang in C++11 mode"
Bernhard Rosenkränzer [Tue, 25 Nov 2014 20:55:33 +0000 (21:55 +0100)]
Fix build with clang in C++11 mode
Now that we're in C++11 mode by default, clang complains about switch
statements with case values not matching the type -- since some
binder_driver_return_protocol values are > 0x7fffffff, we need to make
the switch statements operate on uint32_t rather than int32_t.
BUG:
18466763
Change-Id: Iedbfd5c7a3d3d9f087d2eab4ff21343ad7a2a448
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
chh [Tue, 25 Nov 2014 19:04:12 +0000 (19:04 +0000)]
am
45aa0227: Merge "Fix potential format string vulnerability"
* commit '
45aa022710165c321cdec9a475f269d6932fe1f3':
Fix potential format string vulnerability
Andreas Gampe [Tue, 25 Nov 2014 18:52:24 +0000 (18:52 +0000)]
am
2e42a906: Merge "Binder: Remove unused functions & variables"
* commit '
2e42a90653abd0fc8a76909b5f101782d187136e':
Binder: Remove unused functions & variables
Michael Lentine [Tue, 25 Nov 2014 18:44:51 +0000 (18:44 +0000)]
am
b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
* commit '
b947f29a6af1622cda16d0b7112595082750dd07':
Add clamp to Layer and update Transform inverse.
Dianne Hackborn [Tue, 25 Nov 2014 17:36:43 +0000 (17:36 +0000)]
am
e8a4dce8: Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '
e8a4dce8169ba5fdcd86a5fc29aa6986de1711b0':
Work on issue #
18486438: Reduce size of bugreport output
Andreas Gampe [Tue, 25 Nov 2014 04:02:04 +0000 (20:02 -0800)]
OpenGL tests: Fix unused variables
For build-system CFLAGS clean-up, fix unused variables.
Change-Id: I1863418f7467412d7698dd0ce0c8e40d1bd0348e
Sangkyu Lee [Fri, 7 Nov 2014 09:55:07 +0000 (18:55 +0900)]
Avoid overwriting EGL14.EGL_NO_SURFACE
Both EGL14 and EGLExt have the same initialization codes for
EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY.
Since EGLExt is initialized later, they are overwritten by EGLExt's
initialization codes.
Therefore, EGL_NO_SURFACE returned by methods in EGL14 is not
actually EGL14.EGL_NO_SURFACE object and it makes several problems in
handling error cases.
For instance, "Let's fish" game application cannot be run on L.
To solve the problem, this patch makes EGL14.EGL_NO_SURFACE,
EGL14.EGL_NO_CONTEXT and EGL14.EGL_NO_DISPLAY initialized just once.
Change-Id: Icce878164ff0b715ad2b5a2cd038a9616c7cf1e9
chh [Tue, 25 Nov 2014 01:04:09 +0000 (01:04 +0000)]
Merge "Fix potential format string vulnerability"
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:06:20 +0000 (21:06 +0100)]
Fix potential format string vulnerability
A sensor name containing a format string could have interesting side
effects...
Change-Id: If7f1378aa68572d9716c339728eab18faa6b9f2a
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Michael Lentine [Tue, 25 Nov 2014 00:56:51 +0000 (00:56 +0000)]
Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
Andreas Gampe [Mon, 24 Nov 2014 20:32:40 +0000 (20:32 +0000)]
Merge "Binder: Remove unused functions & variables"
Andreas Gampe [Mon, 24 Nov 2014 19:39:11 +0000 (11:39 -0800)]
Binder: Remove unused functions & variables
For build-system CFLAGS clean-up, remove unused functions and
variables.
Change-Id: I88abc2bc99e6b91c7aa56470ff9671bf8bf29f8d
Eino-Ville Talvala [Mon, 24 Nov 2014 18:05:35 +0000 (18:05 +0000)]
am
9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
* commit '
9c08f6c8364ce82c3855ad8c6ee98cb2c6595141':
Camera: Add XML entries and files for new system features
Dianne Hackborn [Mon, 24 Nov 2014 17:53:55 +0000 (17:53 +0000)]
Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
Narayan Kamath [Mon, 24 Nov 2014 13:24:58 +0000 (13:24 +0000)]
am
8e5fdac4: Merge "Mark 2 unused paramters as such"
* commit '
8e5fdac4de722d4f1333471a5a60412a0db2d1df':
Mark 2 unused paramters as such
Narayan Kamath [Mon, 24 Nov 2014 13:16:36 +0000 (13:16 +0000)]
Merge "Mark 2 unused paramters as such"
Bernhard Rosenkränzer [Sun, 23 Nov 2014 21:28:26 +0000 (22:28 +0100)]
Mark 2 unused paramters as such
Mark 2 unused paramters to prevent clang from erroring out
Change-Id: Ifc9b4a5b820bd6318e9259e737e708d25fdb174b
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Elliott Hughes [Sat, 22 Nov 2014 08:01:17 +0000 (08:01 +0000)]
am
e0f91c37: Merge "We HAVE_LITTLE_ENDIAN."
* commit '
e0f91c3731b16b010eb31117e941e5468bdfeb2e':
We HAVE_LITTLE_ENDIAN.
Elliott Hughes [Sat, 22 Nov 2014 07:49:31 +0000 (07:49 +0000)]
Merge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 07:35:36 +0000 (23:35 -0800)]
We HAVE_LITTLE_ENDIAN.
Change-Id: I68551ad663f2649a06b1958e9bef152e6d026e72
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:51 +0000 (04:57 +0000)]
Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 20 Nov 2014 23:37:51 +0000 (15:37 -0800)]
Camera: Add XML entries and files for new system features
Add BURST_CAPTURE and READ_SENSOR_SETTINGS.
Bug:
18281970
Change-Id: Ibf596c97fbca46f2ae044b6c87586d76605a5163
Michael Lentine [Thu, 20 Nov 2014 02:32:37 +0000 (18:32 -0800)]
Add clamp to Layer and update Transform inverse.
Ensure that the adjusted transparent region is within
the display bounds by clamping after the transformation
is applied and clean up transform's inverse function.
Bug:
18452546
Change-Id: Ia473e483ee8374177bcb84d8192eb1f0e86f022a
Dianne Hackborn [Sat, 22 Nov 2014 00:39:24 +0000 (16:39 -0800)]
Work on issue #
18486438: Reduce size of bugreport output
Don't put packages.xml in to the output.
Change-Id: I88a682866365886506a003a64deb4a29c16ba21c
Greg Hackmann [Fri, 21 Nov 2014 20:36:08 +0000 (20:36 +0000)]
am
e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
* commit '
e4c7ec847d83edfb54c215f3ab6093efeb17a586':
atrace: make fs-specific sysfs entries optional
Greg Hackmann [Fri, 21 Nov 2014 20:27:07 +0000 (20:27 +0000)]
Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
Mike Lockwood [Fri, 21 Nov 2014 05:10:57 +0000 (05:10 +0000)]
am
754f16fc: Merge "Fix installd command line parser"
* commit '
754f16fcf4b56f52450f91e3e840bad8a2cc997c':
Fix installd command line parser
Mike Lockwood [Fri, 21 Nov 2014 05:02:50 +0000 (05:02 +0000)]
Merge "Fix installd command line parser"
Lajos Molnar [Thu, 20 Nov 2014 23:05:47 +0000 (23:05 +0000)]
am
a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
* commit '
a63caa1983138e561b2b033c5d178636beeb1578':
omx: add (temporary) index for automatic video frc support
Fix issue #
18356768: some app process may hang at Runtime#exit...
Dan Albert [Thu, 20 Nov 2014 23:00:48 +0000 (23:00 +0000)]
am
c894c204: Merge "C++11 compatibility."
* commit '
c894c2045f589571c80af0648e7a9dcd7e97b6a8':
C++11 compatibility.
Elliott Hughes [Thu, 20 Nov 2014 23:00:26 +0000 (23:00 +0000)]
am
ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '
ba4a43c6c78547444446181b4fae20a5d61d35ff':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Dan Albert [Thu, 20 Nov 2014 22:06:43 +0000 (22:06 +0000)]
Merge "C++11 compatibility."
Greg Hackmann [Thu, 20 Nov 2014 20:59:44 +0000 (12:59 -0800)]
atrace: make fs-specific sysfs entries optional
The availability of these sysfs entries will vary based on the kernel's
supported filesystems, so don't block the disk category if some of them
are missing.
Bug:
18467498
Change-Id: I96200f1b5cf3f1a8fa8186602552adc96ddffc04
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Dan Albert [Thu, 20 Nov 2014 19:50:23 +0000 (11:50 -0800)]
C++11 compatibility.
* Explicit conversion for atomic_uintptr_t initialization.
* Fix string literal concatenation to not be a UD literal.
* Use __typeof__ instead of typeof (should become decltype once this
actually moves to C++11).
Bug:
18466763
Change-Id: I4eedddfb945a2a703ed27317cb6e2b3041b1ebfc
Elliott Hughes [Thu, 20 Nov 2014 20:58:53 +0000 (20:58 +0000)]
Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
Elliott Hughes [Thu, 20 Nov 2014 20:54:21 +0000 (12:54 -0800)]
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: I692179cae9d476dd5a0b5fa92813b61934dd7c87
Narayan Kamath [Thu, 20 Nov 2014 11:04:43 +0000 (11:04 +0000)]
resolved conflicts for merge of
fd5a3e06 to lmp-mr1-dev-plus-aosp
Change-Id: Ib4578fab76fdbb8deda016f065b60dcb172d3ad2
Narayan Kamath [Thu, 20 Nov 2014 10:47:10 +0000 (10:47 +0000)]
Merge "Add an installd command to mark the end of boot."
Lajos Molnar [Thu, 20 Nov 2014 06:44:41 +0000 (06:44 +0000)]
Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
Lajos Molnar [Thu, 6 Nov 2014 18:47:41 +0000 (10:47 -0800)]
omx: add (temporary) index for automatic video frc support
Bug:
17383204
Change-Id: I9b22da03ea3f2a7d9dd85042fff442d2414cbc26
Narayan Kamath [Mon, 10 Nov 2014 15:03:46 +0000 (15:03 +0000)]
Add an installd command to mark the end of boot.
bug:
18280671
(cherry picked from commit
b1a6c2f95a455aa2829340fcc8d233493855f4d4)
Change-Id: I97542875ffff1b68ab324e9b04fb9266c82633cc
Dan Stoza [Tue, 18 Nov 2014 02:07:36 +0000 (02:07 +0000)]
am
6b9454d1: SurfaceFlinger: Do less work when using PTS
* commit '
6b9454d1fee0347711af1746642aa7820b1ea04d':
SurfaceFlinger: Do less work when using PTS
Chih-hung Hsieh [Tue, 18 Nov 2014 00:23:08 +0000 (00:23 +0000)]
am
947a6adf: Merge "Remove comparisons that can\'t be true"
* commit '
947a6adf97d9ba86e3ef5704d523b4971246ff1e':
Remove comparisons that can't be true
Chih-hung Hsieh [Tue, 18 Nov 2014 00:14:44 +0000 (00:14 +0000)]
Merge "Remove comparisons that can't be true"
Chih-hung Hsieh [Mon, 17 Nov 2014 22:58:50 +0000 (22:58 +0000)]
am
1bb53054: Merge "Fix class vs. struct mismatch"
* commit '
1bb53054f2d77ce570a22629006c849fc54707dc':
Fix class vs. struct mismatch
Chih-hung Hsieh [Mon, 17 Nov 2014 21:49:45 +0000 (21:49 +0000)]
Merge "Fix class vs. struct mismatch"
Dan Stoza [Sat, 8 Nov 2014 00:00:59 +0000 (16:00 -0800)]
SurfaceFlinger: Do less work when using PTS
Currently, SurfaceFlinger is very dumb about how it handles buffer
updates at less than 60fps. If there is a new frame pending, but its
timestamp says not to present it until later SurfaceFlinger will wake
up every vsync until it is time to present it. Even worse, if
SurfaceFlinger has woken up but nothing has changed, it still goes
through the entire composition process.
This change (mostly) fixes that inefficiency. SurfaceFlinger will
still wake up every refresh period while there is a new frame
pending, but if there is no work to do, it will almost immediately go
back to sleep.
Bug:
18111837
Change-Id: I7825bacd37f40bf26edcc6a5e0f051dce45291fb
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:12:15 +0000 (21:12 +0100)]
Fix class vs. struct mismatch
egl_connection_t is a struct - shouldn't be forward-declared as a class
Change-Id: I39f5d9bff9fc64f4694fb2bef7e4afa131b449cc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:09:14 +0000 (21:09 +0100)]
Remove comparisons that can't be true
keyBitmask and ledBitmask are arrays, "!their address" always evaluates to
false. clang complains about this.
Change-Id: I6aed45a203b0eeaad2093dbdebea03a2c2fc1a3d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Dianne Hackborn [Mon, 17 Nov 2014 19:32:03 +0000 (19:32 +0000)]
am
7d9fdd1e: Merge "Issue #
17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
* commit '
7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1':
Issue #
17551667: Voice interaction service should be disabled...
Marco Nelissen [Mon, 17 Nov 2014 18:52:56 +0000 (18:52 +0000)]
am
55f71bc0: Merge "Replace IInterface::asBinder() with a static"
* commit '
55f71bc0800b9ec7a779c5d30d5a90e074c2526b':
Replace IInterface::asBinder() with a static
Dianne Hackborn [Mon, 17 Nov 2014 18:33:20 +0000 (18:33 +0000)]
Merge "Issue #
17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
Marco Nelissen [Mon, 17 Nov 2014 18:14:15 +0000 (18:14 +0000)]
Merge "Replace IInterface::asBinder() with a static"
Marco Nelissen [Fri, 14 Nov 2014 16:01:01 +0000 (08:01 -0800)]
Replace IInterface::asBinder() with a static
so we can do NULL checks again, and update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
The Android Automerger [Mon, 17 Nov 2014 14:11:58 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Dan Albert [Sun, 16 Nov 2014 17:31:57 +0000 (17:31 +0000)]
am
d72ff140: Merge "Move frameworks/native to libc++."
* commit '
d72ff140e0df44106cd8539396ce686aa8f3306a':
Move frameworks/native to libc++.
Dan Albert [Sun, 16 Nov 2014 17:23:12 +0000 (17:23 +0000)]
Merge "Move frameworks/native to libc++."
Dan Albert [Sun, 16 Nov 2014 02:18:17 +0000 (18:18 -0800)]
Move frameworks/native to libc++.
I'm pretty sure I had done this before... Must have been new
dependencies that slipped in when L merged in.
Bug:
15193147
Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0
Yin-Chia Yeh [Sat, 15 Nov 2014 15:46:07 +0000 (15:46 +0000)]
am
3a1c6dac: Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
* commit '
3a1c6dacecb328a38ae26c513246eab7a84219f2':
Add XML files for new camera2 hardware features
Dianne Hackborn [Fri, 14 Nov 2014 23:45:13 +0000 (15:45 -0800)]
Issue #
17551667: Voice interaction service should be disabled...
...by default on Svelte devices
Make the voice interaction feature not available on svelte devices.
Change-Id: Iae16ff59873e6588d2aaa29624006261439262ef
Yin-Chia Yeh [Fri, 14 Nov 2014 18:56:00 +0000 (18:56 +0000)]
Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
Narayan Kamath [Fri, 14 Nov 2014 10:42:55 +0000 (10:42 +0000)]
Narayan Kamath [Fri, 14 Nov 2014 10:23:48 +0000 (10:23 +0000)]
Fix build.
Remove reference to undefined open max index extension.
Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9
Lajos Molnar [Fri, 14 Nov 2014 10:10:15 +0000 (10:10 +0000)]
am
1d5d637d: Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
* commit '
1d5d637d6e68bd4965bf0ff9df7b99bc146172f3':
implement asString() for OMX enumerations used by framework
Lajos Molnar [Fri, 14 Nov 2014 10:02:21 +0000 (10:02 +0000)]
Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #
18356768: some app process may hang at Runtime#exit...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
Dianne Hackborn [Fri, 14 Nov 2014 01:43:31 +0000 (01:43 +0000)]
am
a4cff88d: Fix issue #
18356768: some app process may hang at Runtime#exit...
* commit '
a4cff88d80bf1acbdbd063af88ecad83a8b9b7b4':
Fix issue #
18356768: some app process may hang at Runtime#exit...
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #
18356768: some app process may hang at Runtime#exit...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
Ian Rogers [Fri, 14 Nov 2014 00:30:33 +0000 (00:30 +0000)]
am
11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
* commit '
11bf9e5c2f90101d56d918e1b3fe780b873e5566':
Add support for dalvik.vm.isa.<instruction set>.variant
Ian Rogers [Fri, 14 Nov 2014 00:20:51 +0000 (00:20 +0000)]
Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
Yabin Cui [Thu, 13 Nov 2014 23:35:25 +0000 (23:35 +0000)]
am
bc49cd07: Merge "kill HAVE_FORKEXEC"
* commit '
bc49cd07664d8a590bc6ed44884ba9405f6b706e':
kill HAVE_FORKEXEC
Yabin Cui [Thu, 13 Nov 2014 23:22:26 +0000 (23:22 +0000)]
Merge "kill HAVE_FORKEXEC"
Andreas Gampe [Thu, 13 Nov 2014 23:19:37 +0000 (23:19 +0000)]
am
9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '
9c17fb191253e9bdc9fc73ba9ff2d590892e5061':
Frameworks/native: Wall Werror in batteryservice & powermanager
Andreas Gampe [Thu, 13 Nov 2014 22:59:49 +0000 (14:59 -0800)]
resolved conflicts for merge of
07dffa18 to lmp-mr1-dev-plus-aosp
Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
Andreas Gampe [Thu, 13 Nov 2014 22:55:41 +0000 (22:55 +0000)]
Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
Andreas Gampe [Thu, 13 Nov 2014 22:33:47 +0000 (22:33 +0000)]
Merge "Frameworks/native: Wall Werror in surfaceflinger"
Andreas Gampe [Thu, 13 Nov 2014 22:31:11 +0000 (14:31 -0800)]
Frameworks/native: Wall Werror in batteryservice & powermanager
Turn on -Wall -Werror in services/batteryservice and services/powermanager.
Fix warnings.
Change-Id: I1da667083013379cd8240377c48d63fa5c53033d
Andreas Gampe [Thu, 13 Nov 2014 22:18:56 +0000 (14:18 -0800)]
Frameworks/native: Wall Werror in surfaceflinger
Turn on -Wall -Werror in services/surfaceflinger. Fix warnings.
Change-Id: Ifef830300d9d4bc657d8f1257c02bfe8c2b4d9c5
Yin-Chia Yeh [Thu, 13 Nov 2014 18:08:20 +0000 (10:08 -0800)]
Add XML files for new camera2 hardware features
Bug:
18276863
Change-Id: I65fa70e5ee2e9b90f819ca39f933279905b37f38
Yabin Cui [Tue, 11 Nov 2014 17:26:00 +0000 (09:26 -0800)]
kill HAVE_FORKEXEC
Bug:
18317407
Change-Id: I0c7b5886e5de12bdd95cfcc046bc87e4a6aeef5b
Andreas Gampe [Wed, 12 Nov 2014 18:40:21 +0000 (18:40 +0000)]
am
fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit '
fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
Frameworks/native: Add pragmas to glgen headers
Andreas Gampe [Wed, 12 Nov 2014 18:30:40 +0000 (18:30 +0000)]
Merge "Frameworks/native: Add pragmas to glgen headers"
Andreas Gampe [Tue, 11 Nov 2014 06:51:01 +0000 (22:51 -0800)]
Frameworks/native: Add pragmas to glgen headers
The code currently being generated by glgen is not the cleanest, but
we would like to get core/jni onto -Werror. Thus add pragmas turning
off warnings locally to the C headers.
Also fix signed-comparison in two functions.
Longer term TODO: Emit clean code.
Change-Id: Iee8582f8c0c1de076d64851d3b6ca467afd5bc43
Jesse Hall [Wed, 12 Nov 2014 17:31:03 +0000 (17:31 +0000)]
am
7b3fd290: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
* commit '
7b3fd29037bc12c2691e06334bf51171853aa8f3':
EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
Jesse Hall [Wed, 12 Nov 2014 17:21:26 +0000 (17:21 +0000)]
Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"