OSDN Git Service
Dan Stoza [Fri, 5 Dec 2014 22:20:12 +0000 (22:20 +0000)]
Merge "libui: Remove LOG_TAG #define in Rect.h"
Dan Stoza [Fri, 5 Dec 2014 22:17:45 +0000 (14:17 -0800)]
libui: Remove LOG_TAG #define in Rect.h
The redefinition of LOG_TAG in a header file was causing some issues
for code that had strict warnings and -Werror enabled, so remove the
(possible re-)definition
Change-Id: I7ecb907463ba98fbdbd8b9734a000b2f27f43a65
Dan Stoza [Fri, 5 Dec 2014 21:45:07 +0000 (21:45 +0000)]
Merge "libgui: Only allow one return from useFenceSync"
Dan Stoza [Fri, 5 Dec 2014 21:43:03 +0000 (13:43 -0800)]
libgui: Only allow one return from useFenceSync
An #ifdef was causing multiple returns in this function, which was
triggering an unreachable code error on some build targets. This
adds an #else to ensure that only one return is exposed in any given
build.
Change-Id: I9ed7c3e769bc9094ad31d810944227d1d8302886
Dan Stoza [Fri, 5 Dec 2014 21:27:34 +0000 (21:27 +0000)]
am
59b5783d: am
e1a2caeb: Merge "Fix crash when user provides large values in the Parcel."
* commit '
59b5783df7a80f354f8a996c9a1532a5ab384436':
Fix crash when user provides large values in the Parcel.
Dan Stoza [Fri, 5 Dec 2014 21:19:19 +0000 (21:19 +0000)]
am
e1a2caeb: Merge "Fix crash when user provides large values in the Parcel."
* commit '
e1a2caeb2c75840b092081e28d988342ee958c34':
Fix crash when user provides large values in the Parcel.
Dan Stoza [Fri, 5 Dec 2014 21:08:42 +0000 (21:08 +0000)]
Merge "Fix crash when user provides large values in the Parcel."
Michael Lentine [Fri, 31 Oct 2014 18:10:13 +0000 (11:10 -0700)]
Fix crash when user provides large values in the Parcel.
Bug:
18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
(cherry-picked from commit
8afa1c4ab86d724feb7716e153b7835385534590)
Dan Stoza [Tue, 18 Nov 2014 18:24:03 +0000 (10:24 -0800)]
libgui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.
Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6
Dan Albert [Fri, 5 Dec 2014 18:25:17 +0000 (18:25 +0000)]
am
6efc505b: am
09b9193d: Merge "Fix -Werror on 64-bit builds"
* commit '
6efc505bd8dbddf96f9f8f1984196c511d48b3b0':
Fix -Werror on 64-bit builds
Dan Albert [Fri, 5 Dec 2014 18:25:16 +0000 (18:25 +0000)]
am
bcf7f221: am
67df03d0: Merge "Disable struct padding warning/error"
* commit '
bcf7f22102db47e37a8398d71895fa233ff84d84':
Disable struct padding warning/error
Dan Albert [Fri, 5 Dec 2014 18:25:15 +0000 (18:25 +0000)]
am
bb371535: (-s ours) am
35df7531: Merge "libui: Enable -Weverything and -Werror"
* commit '
bb3715357781c6a0cecc0aaf36ff3d5394155180':
libui: Enable -Weverything and -Werror
Dan Albert [Fri, 5 Dec 2014 18:17:31 +0000 (10:17 -0800)]
resolved conflicts for merge of
75301146 to master
Change-Id: Ibea283651688ef345559f9485a000d385920f4db
Dan Albert [Fri, 5 Dec 2014 18:09:00 +0000 (18:09 +0000)]
am
9f6b6732: am
e2824e04: Merge "Fix for corruption when numFds or numInts is too large."
* commit '
9f6b6732f89ff28f8b58d828423268e96e644f2c':
Fix for corruption when numFds or numInts is too large.
Dan Albert [Fri, 5 Dec 2014 18:01:50 +0000 (18:01 +0000)]
am
09b9193d: Merge "Fix -Werror on 64-bit builds"
* commit '
09b9193d10b3849e426c5370a757a0eedc65a7ff':
Fix -Werror on 64-bit builds
Dan Albert [Fri, 5 Dec 2014 18:01:49 +0000 (18:01 +0000)]
am
67df03d0: Merge "Disable struct padding warning/error"
* commit '
67df03d054f0cc4bd0e47066642b791198e9b0ad':
Disable struct padding warning/error
Dan Albert [Fri, 5 Dec 2014 18:01:49 +0000 (18:01 +0000)]
am
35df7531: Merge "libui: Enable -Weverything and -Werror"
* commit '
35df753169397d9b647b251446af7093e237d047':
libui: Enable -Weverything and -Werror
Dan Albert [Fri, 5 Dec 2014 18:01:48 +0000 (18:01 +0000)]
am
5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"
* commit '
5588d9000cd1ef217185c9001d6b5ecd84db9741':
Enable clang for libui/libgui/surfaceflinger
Dan Albert [Fri, 5 Dec 2014 18:01:47 +0000 (18:01 +0000)]
am
e2824e04: Merge "Fix for corruption when numFds or numInts is too large."
* commit '
e2824e04942adf5a30c73751636648dd6fc18fef':
Fix for corruption when numFds or numInts is too large.
Dan Albert [Fri, 5 Dec 2014 17:48:53 +0000 (17:48 +0000)]
Merge "Fix -Werror on 64-bit builds"
Dan Albert [Fri, 5 Dec 2014 17:48:47 +0000 (17:48 +0000)]
Merge "Disable struct padding warning/error"
Dan Albert [Fri, 5 Dec 2014 17:48:10 +0000 (17:48 +0000)]
Merge "libui: Enable -Weverything and -Werror"
Dan Albert [Fri, 5 Dec 2014 17:47:58 +0000 (17:47 +0000)]
Merge "Enable clang for libui/libgui/surfaceflinger"
Dan Albert [Fri, 5 Dec 2014 17:47:37 +0000 (17:47 +0000)]
Merge "Fix for corruption when numFds or numInts is too large."
Dan Stoza [Mon, 1 Dec 2014 23:15:31 +0000 (15:15 -0800)]
Fix -Werror on 64-bit builds
Add another static_cast to avoid an error on 64-bit builds
Change-Id: I62fb2c67766c4aab70d9d1834f255d06ff82dd8d
(cherry picked from commit
116c7a113cb2db4d3f7708627ac4713c7e92cd43)
Dan Stoza [Mon, 1 Dec 2014 23:03:34 +0000 (15:03 -0800)]
Disable struct padding warning/error
Adds -Wno-padded, which was triggering on 64-bit devices
Change-Id: If27bac27881f2081a222b32213901f5087554b07
(cherry picked from commit
4e84bd310c876e1450077959333c87e6e83dbf63)
Dan Stoza [Mon, 17 Nov 2014 20:03:59 +0000 (12:03 -0800)]
libui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.
Change-Id: I470a267e9b1c373f2d5c960f005c3b0e02b2db63
(cherry picked from commit
303b9a51239d36d237a7d40c67b5085cdb3c1059)
Dan Stoza [Tue, 11 Nov 2014 18:32:31 +0000 (10:32 -0800)]
Enable clang for libui/libgui/surfaceflinger
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
(cherry picked from commit
f10c46ef855b6410b20ebd8b1351d4d78d8eca8e)
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.
Bug:
18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
(cherry picked from commit
dfd06b89a4b77fc75eb85a3c1c700da3621c0118)
Eino-Ville Talvala [Thu, 4 Dec 2014 20:45:42 +0000 (20:45 +0000)]
am
61980a32: am
c5380438: Revert "Camera: Add XML entries and files for new system features"
* commit '
61980a326618d3f55f39fb86e9d3005fd975062c':
Revert "Camera: Add XML entries and files for new system features"
Eino-Ville Talvala [Thu, 4 Dec 2014 20:23:37 +0000 (20:23 +0000)]
am
c5380438: Revert "Camera: Add XML entries and files for new system features"
* commit '
c538043889b773eeeae0bf0ac54b06cd68360734':
Revert "Camera: Add XML entries and files for new system features"
Dan Stoza [Thu, 4 Dec 2014 16:15:54 +0000 (16:15 +0000)]
am
db5827d3: am
5878444f: SurfaceFlinger: Listen to HWC invalidate
* commit '
db5827d314ddca3d473947b4ef49e811fad70069':
SurfaceFlinger: Listen to HWC invalidate
Dan Stoza [Wed, 3 Dec 2014 20:43:29 +0000 (20:43 +0000)]
am
5878444f: SurfaceFlinger: Listen to HWC invalidate
* commit '
5878444fb8da043021f30d3de739531f15390df5':
SurfaceFlinger: Listen to HWC invalidate
Eino-Ville Talvala [Wed, 3 Dec 2014 18:54:28 +0000 (18:54 +0000)]
Revert "Camera: Add XML entries and files for new system features"
This reverts commit
e86d1091766b012da1f6616c7ec270d332baef95.
Bug:
18281970
Bug:
18573576
Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
Dan Stoza [Wed, 3 Dec 2014 00:58:17 +0000 (16:58 -0800)]
SurfaceFlinger: Listen to HWC invalidate
"Do less work when using PTS" broke the invalidate path up from HWC
to SurfaceFlinger. When HWC would signal an invalidate, SurfaceFinger
would wake up, see no new buffers, and go back to sleep. This is fine,
except when the invalidate is a result of an HDMI hotplug, in which
case the screen remains blank. This change makes that functionality
work again.
Bug:
18564815
Bug:
18558468
Change-Id: I2e2171d86839945f4e4e6555d66f7e2895bd096a
Andreas Gampe [Tue, 2 Dec 2014 18:52:11 +0000 (18:52 +0000)]
am
84fd9bd1: am
f8954c81: Merge "OpenGL tests: Fix unused variables"
* commit '
84fd9bd151f4aa2392afcb9d7f9e054d035353d5':
OpenGL tests: Fix unused variables
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 01:25:09 +0000 (01:25 +0000)]
am
414fd6fc: am
4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '
414fd6fc7a1023a1ca5843e14e7634dfaf255a54':
Avoid overwriting EGL14.EGL_NO_SURFACE
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 23:15:31 +0000 (15:15 -0800)]
Fix -Werror on 64-bit builds
Add another static_cast to avoid an error on 64-bit builds
Change-Id: I62fb2c67766c4aab70d9d1834f255d06ff82dd8d
Dan Stoza [Mon, 1 Dec 2014 23:03:34 +0000 (15:03 -0800)]
Disable struct padding warning/error
Adds -Wno-padded, which was triggering on 64-bit devices
Change-Id: If27bac27881f2081a222b32213901f5087554b07
Dan Stoza [Mon, 17 Nov 2014 20:03:59 +0000 (12:03 -0800)]
libui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.
Change-Id: I470a267e9b1c373f2d5c960f005c3b0e02b2db63
Dan Stoza [Mon, 1 Dec 2014 19:29:12 +0000 (19:29 +0000)]
am
e4ea03f7: am
80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"
* commit '
e4ea03f74ded76f588501bd2e90ecb767c6426b3':
binder: Add {read,write}Uint32 methods to Parcel
Dan Stoza [Mon, 1 Dec 2014 19:29:11 +0000 (19:29 +0000)]
am
32ad1d51: am
104e1259: Merge "binder: Return pid_t/uid_t instead of int"
* commit '
32ad1d518b8e89b487c8da2f6ec29c9a30ee5529':
binder: Return pid_t/uid_t instead of int
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 [Wed, 26 Nov 2014 00:01:55 +0000 (00:01 +0000)]
am
7d831769: am
46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"
* commit '
7d831769fce188251afb02e6b933be7bdfe504b4':
Don't error out because SensorEventConnection::dump overloads BBinder::dump
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 23:01:13 +0000 (23:01 +0000)]
am
a7c75d1b: am
2d7ec9d7: Merge "Fix build with clang in C++11 mode"
* commit '
a7c75d1b17556d9842a7823c94a2c96982687c63':
Fix build with clang in C++11 mode
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:57:17 +0000 (19:57 +0000)]
am
22b99e3a: am
45aa0227: Merge "Fix potential format string vulnerability"
* commit '
22b99e3a9a5797deada897102e71e9a88ae46d24':
Fix potential format string vulnerability
Andreas Gampe [Tue, 25 Nov 2014 19:56:30 +0000 (19:56 +0000)]
am
09efe0ac: am
2e42a906: Merge "Binder: Remove unused functions & variables"
* commit '
09efe0ac2a0f34eb951c9a2b91b2d15e3ab7b7ca':
Binder: Remove unused functions & variables
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
Michael Lentine [Tue, 25 Nov 2014 18:56:41 +0000 (18:56 +0000)]
am
1e611662: am
b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
* commit '
1e6116621bc2f7aedfd52a5f1327b530328435b0':
Add clamp to Layer and update Transform inverse.
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:43:21 +0000 (17:43 +0000)]
am
bbe43a4c: am
e8a4dce8: Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '
bbe43a4cdd0ea9a06d09e451dc256b7de59b5817':
Work on issue #
18486438: Reduce size of bugreport output
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:12:10 +0000 (18:12 +0000)]
am
6086365e: am
9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
* commit '
6086365e41e0e1656e8bfffdf4b70f897f080994':
Camera: Add XML entries and files for new system features
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:28:56 +0000 (13:28 +0000)]
am
769c779c: am
8e5fdac4: Merge "Mark 2 unused paramters as such"
* commit '
769c779ce6dbc0ae780b33956be78bb6944e0705':
Mark 2 unused paramters as such
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:04:43 +0000 (08:04 +0000)]
am
f167968b: am
e0f91c37: Merge "We HAVE_LITTLE_ENDIAN."
* commit '
f167968b4667df017958a653f74c60831faf5ad8':
We HAVE_LITTLE_ENDIAN.
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 23:12:58 +0000 (23:12 +0000)]
am
236e7906: am
e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
* commit '
236e790608aa3d60630d3946f54fb9a3ae01b19f':
atrace: make fs-specific sysfs entries optional
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 12:19:01 +0000 (12:19 +0000)]
am
8b1a2774: am
754f16fc: Merge "Fix installd command line parser"
* commit '
8b1a27740dc9910ffbdf0df775056b6647fe111c':
Fix installd command line parser
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:19:33 +0000 (23:19 +0000)]
am
eb0ad057: am
a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
* commit '
eb0ad057628f18bf762084b5bbefa81c3a228e3f':
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:16:22 +0000 (15:16 -0800)]
resolved conflicts for merge of
c1ced8bb to master
Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0
Elliott Hughes [Thu, 20 Nov 2014 23:09:45 +0000 (23:09 +0000)]
am
8d84b6f9: am
ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '
8d84b6f9f576fe51b2cb4a54042bf95af923e55b':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
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...