OSDN Git Service

android-x86/frameworks-native.git
9 years agoam 472d2afb: Increase growth limit from 64m to 80m for 1024mb hdpi tablet
Mathieu Chartier [Fri, 12 Dec 2014 14:41:23 +0000 (14:41 +0000)]
am 472d2afb: Increase growth limit from 64m to 80m for 1024mb hdpi tablet

* commit '472d2afb19b8194075d72c318e01a4760e5dbe82':
  Increase growth limit from 64m to 80m for 1024mb hdpi tablet

9 years agoam bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."
Chih-Hung Hsieh [Thu, 11 Dec 2014 23:02:01 +0000 (23:02 +0000)]
am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."

* commit 'bceb29c83ea54d38b38e40d66402e56364cff56b':
  Fix clang -Wc++11-narrowing warnings.

9 years agoMerge "Fix clang -Wc++11-narrowing warnings."
Chih-Hung Hsieh [Thu, 11 Dec 2014 22:48:17 +0000 (22:48 +0000)]
Merge "Fix clang -Wc++11-narrowing warnings."

9 years agoFix clang -Wc++11-narrowing warnings.
Chih-Hung Hsieh [Thu, 11 Dec 2014 18:39:59 +0000 (10:39 -0800)]
Fix clang -Wc++11-narrowing warnings.

Clang compiler gives warning to implicit conversions of
literal structure fields, although the compiler generated
implicit conversions are what we want in these cases.

Change-Id: I8f04e7f2fa1db0ed1d1937135d9091532eec3d5b

9 years agoIncrease growth limit from 64m to 80m for 1024mb hdpi tablet
Mathieu Chartier [Thu, 11 Dec 2014 17:56:31 +0000 (09:56 -0800)]
Increase growth limit from 64m to 80m for 1024mb hdpi tablet

Prevents apps hitting oome due to old linear alloc objects being
allocated in the java heap causing the heap to be larger than it
used to be.

Bug: 18707227

Change-Id: Ia49a7e6b24ae9fba1961d600d4599c17313b556b

9 years agoresolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp
Dmitriy Ivanov [Thu, 11 Dec 2014 00:10:44 +0000 (16:10 -0800)]
resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp

Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8

9 years agoSwitch to libsigchain.a
Dmitriy Ivanov [Mon, 20 Oct 2014 21:17:26 +0000 (14:17 -0700)]
Switch to libsigchain.a

  Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
  to export symbols from the static library.

(cherry picked from commit 4340a14fbfe761a46e7a655b568cbd0953773df3)

Bug: 18701723
Change-Id: I70f6fdb64b0d1adbadf96c8de85870a903ec186a

9 years agoam a59d7a6a: Merge "GUI: Remove unused variables"
Andreas Gampe [Tue, 9 Dec 2014 20:09:18 +0000 (20:09 +0000)]
am a59d7a6a: Merge "GUI: Remove unused variables"

* commit 'a59d7a6a66a2b8dcb2d00dbd6371fa89ae45ab04':
  GUI: Remove unused variables

9 years agoMerge "GUI: Remove unused variables"
Andreas Gampe [Tue, 9 Dec 2014 19:57:05 +0000 (19:57 +0000)]
Merge "GUI: Remove unused variables"

9 years agoam e22262ff: (-s ours) Merge "libgui: Enable -Weverything and -Werror"
Dan Stoza [Tue, 9 Dec 2014 13:18:36 +0000 (13:18 +0000)]
am e22262ff: (-s ours) Merge "libgui: Enable -Weverything and -Werror"

* commit 'e22262ffd0bbed53e6d964f2fbcd5ecd85c04403':
  libgui: Enable -Weverything and -Werror

9 years agoam 8fd567b1: Merge "Libui: Remove unused variables"
Andreas Gampe [Tue, 9 Dec 2014 11:25:32 +0000 (11:25 +0000)]
am 8fd567b1: Merge "Libui: Remove unused variables"

* commit '8fd567b127170a3962bc9de637eb7987cee71810':
  Libui: Remove unused variables

9 years agoGUI: Remove unused variables
Andreas Gampe [Tue, 9 Dec 2014 04:42:40 +0000 (20:42 -0800)]
GUI: Remove unused variables

For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: I79fdcf830683d7278f4bf114cfb76a26da1b88ff

9 years agoam e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
Michael Lentine [Mon, 8 Dec 2014 19:10:21 +0000 (19:10 +0000)]
am e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev

* commit 'e329be2e0004216474fe0545ab7a2cb1863d387a':
  Fix for corruption when numFds or numInts is too large.

9 years agoMerge "libgui: Enable -Weverything and -Werror"
Dan Stoza [Mon, 8 Dec 2014 18:46:08 +0000 (18:46 +0000)]
Merge "libgui: Enable -Weverything and -Werror"

9 years agoMerge "Libui: Remove unused variables"
Andreas Gampe [Mon, 8 Dec 2014 18:23:15 +0000 (18:23 +0000)]
Merge "Libui: Remove unused variables"

9 years agoLibui: Remove unused variables
Andreas Gampe [Sat, 6 Dec 2014 04:50:34 +0000 (20:50 -0800)]
Libui: Remove unused variables

For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ib78912ae442ddc6410960ab1efb4fb2faa1a9208

9 years agolibgui: Enable -Weverything and -Werror
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.

This is a squashed commit based on an initial change with a couple of
fixes to avoid breaking certain targets. The source commits are:
  d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f
  00d504c06ea034befe143e6b8cb34d004670ed02
  429ba89cd293633d2f882165066b422c96597df2

Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6

9 years agoam e1a2caeb: Merge "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.

9 years agoMerge "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."

9 years agoFix 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)

9 years agoam 09b9193d: Merge "Fix -Werror on 64-bit builds"
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

9 years agoam 67df03d0: Merge "Disable struct padding warning/error"
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

9 years agoam 35df7531: Merge "libui: Enable -Weverything and -Werror"
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

9 years agoam 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"
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

9 years agoam e2824e04: Merge "Fix for corruption when numFds or numInts is too large."
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.

9 years agoMerge "Fix -Werror on 64-bit builds"
Dan Albert [Fri, 5 Dec 2014 17:48:53 +0000 (17:48 +0000)]
Merge "Fix -Werror on 64-bit builds"

9 years agoMerge "Disable struct padding warning/error"
Dan Albert [Fri, 5 Dec 2014 17:48:47 +0000 (17:48 +0000)]
Merge "Disable struct padding warning/error"

9 years agoMerge "libui: Enable -Weverything and -Werror"
Dan Albert [Fri, 5 Dec 2014 17:48:10 +0000 (17:48 +0000)]
Merge "libui: Enable -Weverything and -Werror"

9 years agoMerge "Enable clang for libui/libgui/surfaceflinger"
Dan Albert [Fri, 5 Dec 2014 17:47:58 +0000 (17:47 +0000)]
Merge "Enable clang for libui/libgui/surfaceflinger"

9 years agoMerge "Fix for corruption when numFds or numInts is too large."
Dan Albert [Fri, 5 Dec 2014 17:47:37 +0000 (17:47 +0000)]
Merge "Fix for corruption when numFds or numInts is too large."

9 years agoFix -Werror on 64-bit builds
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)

9 years agoDisable struct padding warning/error
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)

9 years agolibui: Enable -Weverything and -Werror
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)

9 years agoEnable clang for libui/libgui/surfaceflinger
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)

9 years agoFix for corruption when numFds or numInts is too large.
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)

9 years agoam 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
Michael Lentine [Thu, 4 Dec 2014 23:06:47 +0000 (23:06 +0000)]
am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev

* commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab':
  Fix for corruption when numFds or numInts is too large.

9 years agoam c5380438: 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"

9 years agoam 5878444f: 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

9 years agoRevert "Camera: Add XML entries and files for new system features"
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

9 years agoSurfaceFlinger: Listen to HWC invalidate
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

9 years agoresolved conflicts for merge of d6308379 to lmp-dev
Michael Lentine [Tue, 2 Dec 2014 19:15:56 +0000 (11:15 -0800)]
resolved conflicts for merge of d6308379 to lmp-dev

Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500

9 years agoam f8954c81: Merge "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

9 years agoMerge "OpenGL tests: Fix unused variables"
Andreas Gampe [Tue, 2 Dec 2014 18:24:56 +0000 (18:24 +0000)]
Merge "OpenGL tests: Fix unused variables"

9 years agoam 76ebd319: am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts...
Michael Lentine [Tue, 2 Dec 2014 18:04:09 +0000 (18:04 +0000)]
am 76ebd319: am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit '76ebd319d96494049a2a598f4449c0ec417220f6':
  Fix for corruption when numFds or numInts is too large.

9 years agoam 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:52:00 +0000 (17:52 +0000)]
am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit '3d89edca65e07319c9ac3b9bb9889e80e8c40578':
  Fix for corruption when numFds or numInts is too large.

9 years agoam e6f7a44e: Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:45:44 +0000 (17:45 +0000)]
am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit 'e6f7a44e835d320593fa33052f35ea52948ff0b2':
  Fix for corruption when numFds or numInts is too large.

9 years agoam 4aaa3935: Merge "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

9 years agoMerge "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"

9 years agoam 80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"
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

9 years agoam 104e1259: Merge "binder: Return pid_t/uid_t instead of int"
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

9 years agoMerge "binder: Add {read,write}Uint32 methods to Parcel"
Dan Stoza [Mon, 1 Dec 2014 19:16:16 +0000 (19:16 +0000)]
Merge "binder: Add {read,write}Uint32 methods to Parcel"

9 years agobinder: 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

9 years agoMerge "binder: Return pid_t/uid_t instead of int"
Dan Stoza [Mon, 1 Dec 2014 19:10:58 +0000 (19:10 +0000)]
Merge "binder: Return pid_t/uid_t instead of int"

9 years agobinder: 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

9 years agoam 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads...
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

9 years agoMerge "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"

9 years agoDon'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>
9 years agoam 2d7ec9d7: Merge "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

9 years agoMerge "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"

9 years agoFix 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>
9 years agoam 45aa0227: Merge "Fix potential format string vulnerability"
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

9 years agoam 2e42a906: Merge "Binder: Remove unused functions & variables"
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

9 years agoam b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
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.

9 years agoam e8a4dce8: Merge "Work on issue #18486438: Reduce size of bugreport output" into...
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

9 years agoOpenGL tests: Fix unused variables
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

9 years agoAvoid overwriting EGL14.EGL_NO_SURFACE
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

9 years agoMerge "Fix potential format string vulnerability"
chh [Tue, 25 Nov 2014 01:04:09 +0000 (01:04 +0000)]
Merge "Fix potential format string vulnerability"

9 years agoFix 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>
9 years agoMerge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
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

9 years agoMerge "Binder: Remove unused functions & variables"
Andreas Gampe [Mon, 24 Nov 2014 20:32:40 +0000 (20:32 +0000)]
Merge "Binder: Remove unused functions & variables"

9 years agoBinder: 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

9 years agoam 9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into...
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

9 years agoMerge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev
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

9 years agoam 8e5fdac4: Merge "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

9 years agoMerge "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"

9 years agoMark 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>
9 years agoam e0f91c37: Merge "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.

9 years agoMerge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 07:49:31 +0000 (07:49 +0000)]
Merge "We HAVE_LITTLE_ENDIAN."

9 years agoWe HAVE_LITTLE_ENDIAN.
Elliott Hughes [Sat, 22 Nov 2014 07:35:36 +0000 (23:35 -0800)]
We HAVE_LITTLE_ENDIAN.

Change-Id: I68551ad663f2649a06b1958e9bef152e6d026e72

9 years agoMerge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
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

9 years agoCamera: Add XML entries and files for new system features
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

9 years agoFix for corruption when numFds or numInts is too large.
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

9 years agoAdd clamp to Layer and update Transform inverse.
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

9 years agoWork on issue #18486438: Reduce size of bugreport output
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

9 years agoam e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
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

9 years agoMerge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
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

9 years agoam 754f16fc: Merge "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

9 years agoMerge "Fix installd command line parser"
Mike Lockwood [Fri, 21 Nov 2014 05:02:50 +0000 (05:02 +0000)]
Merge "Fix installd command line parser"

9 years agoam a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into...
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...

9 years agoam c894c204: Merge "C++11 compatibility."
Dan Albert [Thu, 20 Nov 2014 23:00:48 +0000 (23:00 +0000)]
am c894c204: Merge "C++11 compatibility."

* commit 'c894c2045f589571c80af0648e7a9dcd7e97b6a8':
  C++11 compatibility.

9 years agoam ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
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.

9 years agoMerge "C++11 compatibility."
Dan Albert [Thu, 20 Nov 2014 22:06:43 +0000 (22:06 +0000)]
Merge "C++11 compatibility."

9 years agoatrace: make fs-specific sysfs entries optional
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>
9 years agoC++11 compatibility.
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

9 years agoMerge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
Elliott Hughes [Thu, 20 Nov 2014 20:58:53 +0000 (20:58 +0000)]
Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."

9 years agoKill 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

9 years agoresolved conflicts for merge of fd5a3e06 to lmp-mr1-dev-plus-aosp
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

9 years agoMerge "Add an installd command to mark the end of boot."
Narayan Kamath [Thu, 20 Nov 2014 10:47:10 +0000 (10:47 +0000)]
Merge "Add an installd command to mark the end of boot."

9 years agoMerge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
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

9 years agoomx: add (temporary) index for automatic video frc support
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