Commit Graph

51810 Commits

Author SHA1 Message Date
Andreas Gampe
80ea4e0373 am 5d11a72b: am 8fd567b1: Merge "Libui: Remove unused variables"
* commit '5d11a72bcd7d92ea0c0bf3959ed45380264f0495':
  Libui: Remove unused variables
2014-12-09 23:24:10 +00:00
Andreas Gampe
5d11a72bcd am 8fd567b1: Merge "Libui: Remove unused variables"
* commit '8fd567b127170a3962bc9de637eb7987cee71810':
  Libui: Remove unused variables
2014-12-09 11:25:32 +00:00
Michael Lentine
4dd982125f am 39770311: am e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
* commit '397703119bc1d5d67491b559511578820855dde2':
  Fix for corruption when numFds or numInts is too large.
2014-12-08 20:28:53 +00:00
Michael Lentine
397703119b 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.
2014-12-08 19:10:21 +00:00
Andreas Gampe
8fd567b127 Merge "Libui: Remove unused variables" 2014-12-08 18:23:15 +00:00
Andreas Gampe
ff78750c64 Libui: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ib78912ae442ddc6410960ab1efb4fb2faa1a9208
2014-12-05 20:52:16 -08:00
Dan Stoza
f84fb7064b Merge "libui: Remove LOG_TAG #define in Rect.h" 2014-12-05 22:20:12 +00:00
Dan Stoza
429ba89cd2 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
2014-12-05 14:17:45 -08:00
Dan Stoza
f66b8220b0 Merge "libgui: Only allow one return from useFenceSync" 2014-12-05 21:45:08 +00:00
Dan Stoza
00d504c06e 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
2014-12-05 13:43:03 -08:00
Dan Stoza
15f38abbb5 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.
2014-12-05 21:27:34 +00:00
Dan Stoza
59b5783df7 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.
2014-12-05 21:19:19 +00:00
Dan Stoza
e1a2caeb2c Merge "Fix crash when user provides large values in the Parcel." 2014-12-05 21:08:42 +00:00
Michael Lentine
ae33effd43 Fix crash when user provides large values in the Parcel.
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
(cherry-picked from commit 8afa1c4ab8)
2014-12-05 20:31:09 +00:00
Dan Stoza
d723bd7669 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
2014-12-05 11:06:44 -08:00
Dan Albert
a950eb1879 am 6efc505b: am 09b9193d: Merge "Fix -Werror on 64-bit builds"
* commit '6efc505bd8dbddf96f9f8f1984196c511d48b3b0':
  Fix -Werror on 64-bit builds
2014-12-05 18:25:17 +00:00
Dan Albert
fb81193d44 am bcf7f221: am 67df03d0: Merge "Disable struct padding warning/error"
* commit 'bcf7f22102db47e37a8398d71895fa233ff84d84':
  Disable struct padding warning/error
2014-12-05 18:25:16 +00:00
Dan Albert
895aa0d2f0 am bb371535: (-s ours) am 35df7531: Merge "libui: Enable -Weverything and -Werror"
* commit 'bb3715357781c6a0cecc0aaf36ff3d5394155180':
  libui: Enable -Weverything and -Werror
2014-12-05 18:25:15 +00:00
Dan Albert
07ba4a6038 resolved conflicts for merge of 75301146 to master
Change-Id: Ibea283651688ef345559f9485a000d385920f4db
2014-12-05 10:17:52 -08:00
Dan Albert
e795ebc0cf 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.
2014-12-05 18:09:00 +00:00
Dan Albert
6efc505bd8 am 09b9193d: Merge "Fix -Werror on 64-bit builds"
* commit '09b9193d10b3849e426c5370a757a0eedc65a7ff':
  Fix -Werror on 64-bit builds
2014-12-05 18:01:50 +00:00
Dan Albert
bcf7f22102 am 67df03d0: Merge "Disable struct padding warning/error"
* commit '67df03d054f0cc4bd0e47066642b791198e9b0ad':
  Disable struct padding warning/error
2014-12-05 18:01:49 +00:00
Dan Albert
bb37153577 am 35df7531: Merge "libui: Enable -Weverything and -Werror"
* commit '35df753169397d9b647b251446af7093e237d047':
  libui: Enable -Weverything and -Werror
2014-12-05 18:01:49 +00:00
Dan Albert
7530114619 am 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"
* commit '5588d9000cd1ef217185c9001d6b5ecd84db9741':
  Enable clang for libui/libgui/surfaceflinger
2014-12-05 18:01:48 +00:00
Dan Albert
9f6b6732f8 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.
2014-12-05 18:01:47 +00:00
Dan Albert
09b9193d10 Merge "Fix -Werror on 64-bit builds" 2014-12-05 17:48:53 +00:00
Dan Albert
67df03d054 Merge "Disable struct padding warning/error" 2014-12-05 17:48:47 +00:00
Dan Albert
35df753169 Merge "libui: Enable -Weverything and -Werror" 2014-12-05 17:48:11 +00:00
Dan Albert
5588d9000c Merge "Enable clang for libui/libgui/surfaceflinger" 2014-12-05 17:47:58 +00:00
Dan Albert
e2824e0494 Merge "Fix for corruption when numFds or numInts is too large." 2014-12-05 17:47:37 +00:00
Dan Stoza
133caacf87 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 116c7a113c)
2014-12-04 18:06:48 -08:00
Dan Stoza
42af278173 Disable struct padding warning/error
Adds -Wno-padded, which was triggering on 64-bit devices

Change-Id: If27bac27881f2081a222b32213901f5087554b07
(cherry picked from commit 4e84bd310c)
2014-12-04 18:06:48 -08:00
Dan Stoza
d318240042 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 303b9a5123)
2014-12-04 17:56:27 -08:00
Dan Stoza
01049c8321 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 f10c46ef85)
2014-12-04 17:56:17 -08:00
Michael Lentine
3880326857 Fix for corruption when numFds or numInts is too large.
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
(cherry picked from commit dfd06b89a4)
2014-12-04 17:49:31 -08:00
Michael Lentine
e329be2e00 am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
* commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab':
  Fix for corruption when numFds or numInts is too large.
2014-12-04 23:06:47 +00:00
Eino-Ville Talvala
38fa5e7a7e 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"
2014-12-04 20:45:42 +00:00
Eino-Ville Talvala
61980a3266 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"
2014-12-04 20:23:37 +00:00
Dan Stoza
d6739d5e44 am db5827d3: am 5878444f: SurfaceFlinger: Listen to HWC invalidate
* commit 'db5827d314ddca3d473947b4ef49e811fad70069':
  SurfaceFlinger: Listen to HWC invalidate
2014-12-04 16:15:54 +00:00
Dan Stoza
db5827d314 am 5878444f: SurfaceFlinger: Listen to HWC invalidate
* commit '5878444fb8da043021f30d3de739531f15390df5':
  SurfaceFlinger: Listen to HWC invalidate
2014-12-03 20:43:29 +00:00
Eino-Ville Talvala
c538043889 Revert "Camera: Add XML entries and files for new system features"
This reverts commit e86d109176.

Bug: 18281970
Bug: 18573576
Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
2014-12-03 11:13:06 -08:00
Dan Stoza
5878444fb8 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
2014-12-02 16:58:17 -08:00
Michael Lentine
784fd39a19 resolved conflicts for merge of d6308379 to lmp-dev
Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500
2014-12-02 11:15:56 -08:00
Andreas Gampe
a680db1916 am 84fd9bd1: am f8954c81: Merge "OpenGL tests: Fix unused variables"
* commit '84fd9bd151f4aa2392afcb9d7f9e054d035353d5':
  OpenGL tests: Fix unused variables
2014-12-02 18:52:11 +00:00
Andreas Gampe
84fd9bd151 am f8954c81: Merge "OpenGL tests: Fix unused variables"
* commit 'f8954c81a4ec43958867d1f6f497ef449bf091fd':
  OpenGL tests: Fix unused variables
2014-12-02 18:47:20 +00:00
Andreas Gampe
f8954c81a4 Merge "OpenGL tests: Fix unused variables" 2014-12-02 18:24:57 +00:00
Michael Lentine
d6308379d9 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.
2014-12-02 18:04:09 +00:00
Michael Lentine
76ebd319d9 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.
2014-12-02 17:52:00 +00:00
Michael Lentine
3d89edca65 am e6f7a44e: Fix for corruption when numFds or numInts is too large.
* commit 'e6f7a44e835d320593fa33052f35ea52948ff0b2':
  Fix for corruption when numFds or numInts is too large.
2014-12-02 17:45:44 +00:00
Jesse Hall
8fcd5736c7 am 414fd6fc: am 4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '414fd6fc7a1023a1ca5843e14e7634dfaf255a54':
  Avoid overwriting EGL14.EGL_NO_SURFACE
2014-12-02 01:25:09 +00:00