OSDN Git Service

android-x86/frameworks-native.git
9 years agoam cad831fb: am c6f93a43: Merge "Add missing include to fix libc++ build."
Dan Albert [Fri, 7 Nov 2014 18:41:43 +0000 (18:41 +0000)]
am cad831fb: am c6f93a43: Merge "Add missing include to fix libc++ build."

* commit 'cad831fb15f3c35945cb250d95d31c9b43d65785':
  Add missing include to fix libc++ build.

9 years agoam c6f93a43: Merge "Add missing include to fix libc++ build."
Dan Albert [Fri, 7 Nov 2014 18:37:43 +0000 (18:37 +0000)]
am c6f93a43: Merge "Add missing include to fix libc++ build."

* commit 'c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
  Add missing include to fix libc++ build.

9 years agoMerge "Add missing include to fix libc++ build."
Dan Albert [Fri, 7 Nov 2014 18:04:49 +0000 (18:04 +0000)]
Merge "Add missing include to fix libc++ build."

9 years agoAdd missing include to fix libc++ build.
Dan Albert [Fri, 7 Nov 2014 17:33:44 +0000 (09:33 -0800)]
Add missing include to fix libc++ build.

This was previously committed, but I guess it got lost in the merge
queue.

Bug: 15193147
Change-Id: Ic0e5d90ab403fb833d6a3bb7c55d279c56534869

9 years agoam cd647d01: am 106e5820: Merge "installd: Set priority to background for dexopting...
Igor Murashkin [Thu, 6 Nov 2014 03:01:51 +0000 (03:01 +0000)]
am cd647d01: am 106e5820: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev

* commit 'cd647d01e5e5a17c272f1a0c691c39cb24ae107c':
  installd: Set priority to background for dexopting

9 years agoam 106e5820: Merge "installd: Set priority to background for dexopting" into lmp...
Igor Murashkin [Thu, 6 Nov 2014 02:55:23 +0000 (02:55 +0000)]
am 106e5820: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev

* commit '106e582053121f1934c33a6c98d35377e8ae384a':
  installd: Set priority to background for dexopting

9 years agoam 52211048: am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:48:18 +0000 (02:48 +0000)]
am 52211048: am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev

* commit '522110485465a05f4602ad42ba14a18b11184cca':
  Add missing secure stop methods

9 years agoam 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:44:25 +0000 (02:44 +0000)]
am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev

* commit '621c6f3b13f96b0e84163f355c6f3024cd3afb2e':
  Add missing secure stop methods

9 years agoMerge "installd: Set priority to background for dexopting" into lmp-mr1-dev
Igor Murashkin [Thu, 6 Nov 2014 02:43:56 +0000 (02:43 +0000)]
Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev

9 years agoMerge "Add missing secure stop methods" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:33:31 +0000 (02:33 +0000)]
Merge "Add missing secure stop methods" into lmp-mr1-dev

9 years agoinstalld: Set priority to background for dexopting
Igor Murashkin [Wed, 5 Nov 2014 23:21:12 +0000 (15:21 -0800)]
installd: Set priority to background for dexopting

This fixes jank caused by dex2oat while installing an application in the
background.

Bug: 17497551
Change-Id: I5a69b00c0fd76ae22a0d1adb242bef6c18a75743

9 years agoam a2f27a0d: am 26645298: Merge "Fix for corruption when numFds or numInts is too...
Michael Lentine [Wed, 5 Nov 2014 20:11:32 +0000 (20:11 +0000)]
am a2f27a0d: am 26645298: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev

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

9 years agoam 26645298: Merge "Fix for corruption when numFds or numInts is too large." into...
Michael Lentine [Wed, 5 Nov 2014 19:06:19 +0000 (19:06 +0000)]
am 26645298: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev

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

9 years agoMerge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
Michael Lentine [Wed, 5 Nov 2014 18:58:22 +0000 (18:58 +0000)]
Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev

9 years agoAdd a missing include.
Dan Albert [Wed, 5 Nov 2014 05:46:14 +0000 (21:46 -0800)]
Add a missing include.

Was being included transitively by stlport.

Bug: 15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378

9 years agoam 090dbeb7: am c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++."
Dan Albert [Wed, 5 Nov 2014 03:29:55 +0000 (03:29 +0000)]
am 090dbeb7: am c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++."

* commit '090dbeb7f174e5c1c605d8d91ef0faa2c46e9ee3':
  Move hwc tests to libc++.

9 years agoam c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++."
Dan Albert [Wed, 5 Nov 2014 02:57:31 +0000 (02:57 +0000)]
am c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++."

* commit 'c90b7d9c0f1df1cec8afbfebad0f111d878113e7':
  Move hwc tests to libc++.

9 years agoam d12586b8: Merge "Move hwc tests to libc++."
Dan Albert [Wed, 5 Nov 2014 02:41:59 +0000 (02:41 +0000)]
am d12586b8: Merge "Move hwc tests to libc++."

* commit 'd12586b8593cf0cb894d02104a9794ed9dd85d16':
  Move hwc tests to libc++.

9 years agoMerge "Move hwc tests to libc++."
Dan Albert [Wed, 5 Nov 2014 01:38:09 +0000 (01:38 +0000)]
Merge "Move hwc tests to libc++."

9 years agoMove hwc tests to libc++.
Dan Albert [Wed, 5 Nov 2014 01:25:12 +0000 (17:25 -0800)]
Move hwc tests to libc++.

Since these tests were pulling in a static library linked against
stlport, the tests needed to be explicit about which STL they're
using. Might as well be libc++.

Bug: 15193147
Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e

9 years agoam ea14602e: am 9cea6ccb: dumpstate: report device uptime mmc performance
Mark Salyzyn [Wed, 5 Nov 2014 00:21:48 +0000 (00:21 +0000)]
am ea14602e: am 9cea6ccb: dumpstate: report device uptime mmc performance

* commit 'ea14602e6e1e415f3c6b53ef498d4deff00c23ac':
  dumpstate: report device uptime mmc performance

9 years agoam 9cea6ccb: dumpstate: report device uptime mmc performance
Mark Salyzyn [Wed, 5 Nov 2014 00:15:47 +0000 (00:15 +0000)]
am 9cea6ccb: dumpstate: report device uptime mmc performance

* commit '9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c':
  dumpstate: report device uptime mmc performance

9 years agoam 06ce1094: am fee99040: Revert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 17:40:28 +0000 (17:40 +0000)]
am 06ce1094: am fee99040: Revert "Add more logging for dup(fd) failure"

* commit '06ce1094706bb0856f6cc876e1f5276adc642446':
  Revert "Add more logging for dup(fd) failure"

9 years agoam 88361aaa: am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFil...
Jesse Hall [Tue, 4 Nov 2014 17:40:27 +0000 (17:40 +0000)]
am 88361aaa: am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"

* commit '88361aaaf4f2339f50dc32438a261283c642d471':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"

9 years agoam aa4ccfd1: am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with...
Jesse Hall [Tue, 4 Nov 2014 17:40:27 +0000 (17:40 +0000)]
am aa4ccfd1: am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"

* commit 'aa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e':
  Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"

9 years agodumpstate: report device uptime mmc performance
Mark Salyzyn [Tue, 4 Nov 2014 17:38:19 +0000 (09:38 -0800)]
dumpstate: report device uptime mmc performance

Bug: 18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121

9 years agoam fee99040: Revert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 17:35:23 +0000 (17:35 +0000)]
am fee99040: Revert "Add more logging for dup(fd) failure"

* commit 'fee99040de000a64f6036a7db172fb7c68d9764a':
  Revert "Add more logging for dup(fd) failure"

9 years agoam 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Jesse Hall [Tue, 4 Nov 2014 17:35:23 +0000 (17:35 +0000)]
am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"

* commit '8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"

9 years agoam de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Jesse Hall [Tue, 4 Nov 2014 17:35:22 +0000 (17:35 +0000)]
am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"

* commit 'de288fe2d43adfa1b2243ae534faaf832bf50491':
  Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"

9 years agoRevert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 16:36:31 +0000 (08:36 -0800)]
Revert "Add more logging for dup(fd) failure"

Underlying bug has been fixed, extra debug code no longer needed

This reverts commit 36273c991b189c5516819f4d5e3f83061c320593.

Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20

9 years agoRevert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Jesse Hall [Tue, 4 Nov 2014 16:35:12 +0000 (08:35 -0800)]
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"

Underlying bug has been fixed, extra debug code no longer needed.

This reverts commit ccf851f108c008d086b7f3c3923d60d385985e71.

Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f

9 years agoRevert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Jesse Hall [Tue, 4 Nov 2014 16:30:48 +0000 (08:30 -0800)]
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"

Underlying bug has been fixed, workaround no longer needed

This reverts commit 5b0cbcf9464dbcda9d19ae978911222806ec8bdc.

Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb

9 years agoam 923b0f6a: am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang."
Chih-Hung Hsieh [Tue, 4 Nov 2014 02:09:30 +0000 (02:09 +0000)]
am 923b0f6a: am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang."

* commit '923b0f6a6787462509c23349ac04b8e9360c51cc':
  Avoid two warnings from clang.

9 years agoam ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang."
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:58:17 +0000 (01:58 +0000)]
am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang."

* commit 'ac5cd96fe24690d9e0ae823c77334b8579139aa2':
  Avoid two warnings from clang.

9 years agoam dbab409c: Merge "Avoid two warnings from clang."
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:24:07 +0000 (01:24 +0000)]
am dbab409c: Merge "Avoid two warnings from clang."

* commit 'dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
  Avoid two warnings from clang.

9 years agoam ff520bb9: am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs
Naseer Ahmed [Tue, 4 Nov 2014 01:18:08 +0000 (01:18 +0000)]
am ff520bb9: am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs

* commit 'ff520bb93812f9892da526ace81efce9b0872503':
  sf: Add a NULL check in getDisplayConfigs

9 years agoMerge "Avoid two warnings from clang."
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:14:16 +0000 (01:14 +0000)]
Merge "Avoid two warnings from clang."

9 years agoam 7aa0c47e: sf: Add a NULL check in getDisplayConfigs
Naseer Ahmed [Mon, 3 Nov 2014 22:31:50 +0000 (22:31 +0000)]
am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs

* commit '7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
  sf: Add a NULL check in getDisplayConfigs

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 agosf: Add a NULL check in getDisplayConfigs
Naseer Ahmed [Mon, 3 Nov 2014 19:49:23 +0000 (14:49 -0500)]
sf: Add a NULL check in getDisplayConfigs

Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).

Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)

Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
9 years agoam 54430ca2: am 793fc0e1: Merge "Fix crash when user provides large values in the...
Michael Lentine [Sat, 1 Nov 2014 00:41:16 +0000 (00:41 +0000)]
am 54430ca2: am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev

* commit '54430ca2a88f57c709ea2924ea0b78820ae62643':
  Fix crash when user provides large values in the Parcel.

9 years agoam 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into...
Michael Lentine [Sat, 1 Nov 2014 00:33:29 +0000 (00:33 +0000)]
am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev

* commit '793fc0e13d25bdecda1219999f8be2cb3c121d20':
  Fix crash when user provides large values in the Parcel.

9 years agoMerge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 23:37:47 +0000 (23:37 +0000)]
Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev

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

9 years agoam 078794ed: am 98536859: Merge "Fix output of pointers for 64bit devices." into...
Michael Lentine [Fri, 31 Oct 2014 23:07:01 +0000 (23:07 +0000)]
am 078794ed: am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev

* commit '078794ed377e7080ee155a632482bb98f1c9ade7':
  Fix output of pointers for 64bit devices.

9 years agoam b43a1c9b: am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning"...
Jesse Hall [Fri, 31 Oct 2014 23:07:01 +0000 (23:07 +0000)]
am b43a1c9b: am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev

* commit 'b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e':
  surfaceflinger: fix -Wunused-parameter warning

9 years agoam 18b846dd: am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into...
Jesse Hall [Fri, 31 Oct 2014 23:07:00 +0000 (23:07 +0000)]
am 18b846dd: am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev

* commit '18b846dda798709796be078a7978d885685df9a4':
  surfaceflinger: fix -Wsign-compare warnings

9 years agoam 9fc06c5e: am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning...
Jesse Hall [Fri, 31 Oct 2014 23:06:59 +0000 (23:06 +0000)]
am 9fc06c5e: am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev

* commit '9fc06c5e2131cdf0d76a3838215c057f57da67e3':
  surfaceflinger: fix -Woverloaded-virtual warning

9 years agoam 31705817: resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp
Jesse Hall [Fri, 31 Oct 2014 22:58:46 +0000 (22:58 +0000)]
am 31705817: resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp

* commit '3170581704fa59a8672262c0e6c68f455d470214':
  surfaceflinger: fix -Wmismatched-tags warnings

9 years agoam 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 22:58:19 +0000 (22:58 +0000)]
am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev

* commit '9853685931298ba02066ebb50a8377ad4aa80f00':
  Fix output of pointers for 64bit devices.

9 years agoam affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 22:57:44 +0000 (22:57 +0000)]
am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev

* commit 'affc4d809edbcb3b0e49e5ccc9821b9695a57d44':
  surfaceflinger: fix -Wunused-parameter warning

9 years agoam c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 22:57:43 +0000 (22:57 +0000)]
am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev

* commit 'c7636f606270a4b79d745ec1acf049daedfa0e2f':
  surfaceflinger: fix -Wsign-compare warnings

9 years agoam 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 22:57:42 +0000 (22:57 +0000)]
am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev

* commit '6e74e3ccd972fe90d9998f6b683e25dca38f470d':
  surfaceflinger: fix -Woverloaded-virtual warning

9 years agoresolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp
Jesse Hall [Fri, 31 Oct 2014 22:41:03 +0000 (15:41 -0700)]
resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp

Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0

9 years agoMerge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 18:39:22 +0000 (18:39 +0000)]
Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev

9 years agoAvoid two warnings from clang.
Chih-Hung Hsieh [Fri, 24 Oct 2014 21:10:09 +0000 (14:10 -0700)]
Avoid two warnings from clang.

Clang compiler warns about undefined static functions like getReturnString
before all references are removed inside IF_LOG_COMMANDS.
To remove such warnings, we can leave those static functions defined
and the compiler will remove them at the end when they are not used.

Add a cast to long before converting from int to void*,
to avoid type cast warnings on 64 bit targets.

BUG: 17043248
Change-Id: Ica31101522279d2c8eacc90e2939767002fb827b

9 years agoFix output of pointers for 64bit devices.
Michael Lentine [Fri, 31 Oct 2014 18:08:19 +0000 (11:08 -0700)]
Fix output of pointers for 64bit devices.

Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0

9 years agoMerge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:45 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev

9 years agoMerge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:26 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev

9 years agoMerge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:11 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev

9 years agoMerge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:58:44 +0000 (16:58 +0000)]
Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev

9 years agosurfaceflinger: fix -Wunused-parameter warning
Jesse Hall [Fri, 8 Aug 2014 05:48:06 +0000 (22:48 -0700)]
surfaceflinger: fix -Wunused-parameter warning

warning: unused parameter 'mustRecompose' [-Wunused-parameter]

Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f71709e6af3dbc754e59686129737f2300)

9 years agosurfaceflinger: fix -Wsign-compare warnings
Jesse Hall [Fri, 8 Aug 2014 05:43:06 +0000 (22:43 -0700)]
surfaceflinger: fix -Wsign-compare warnings

warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]

arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]

Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
(cherry picked from f9bfdc6c9449143eed674c03e15dd8278296d32b)

9 years agosurfaceflinger: fix -Woverloaded-virtual warning
Jesse Hall [Fri, 8 Aug 2014 05:33:14 +0000 (22:33 -0700)]
surfaceflinger: fix -Woverloaded-virtual warning

warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]

Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116759ccc19463c03db841e3d6e2d4424)

9 years agosurfaceflinger: fix -Wmismatched-tags warnings
Jesse Hall [Fri, 8 Aug 2014 05:19:07 +0000 (22:19 -0700)]
surfaceflinger: fix -Wmismatched-tags warnings

warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]

warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]

Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
(cherry picked from commit 646f54105018e99ef4a30ee41f01f7d1ab66c38e)

9 years agoAdd missing secure stop methods
Jeff Tinker [Fri, 31 Oct 2014 07:42:33 +0000 (00:42 -0700)]
Add missing secure stop methods

b/18053197
b/18076411

Change-Id: I42b97f7e39d6e9e58990b41a4c4b5a7c9b8a49cf

9 years agoam bc11bbf2: am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp...
Dan Stoza [Thu, 30 Oct 2014 21:06:48 +0000 (21:06 +0000)]
am bc11bbf2: am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev

* commit 'bc11bbf2f0bd38c0f271cb95c138a48d5d9a085b':
  Initialize ARect fields in default ctor

9 years agoam f12f1550: am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Jesse Hall [Thu, 30 Oct 2014 21:06:47 +0000 (21:06 +0000)]
am f12f1550: am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT

* commit 'f12f15502a3092a9f7f28cf45b1a00e2efbd6eac':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT

9 years agoam d7702163: am 1f3efb11: Don\'t run large virtual displays through HWC
Dan Stoza [Thu, 30 Oct 2014 21:06:46 +0000 (21:06 +0000)]
am d7702163: am 1f3efb11: Don\'t run large virtual displays through HWC

* commit 'd77021637e28e66be3fcc097b16869df69717df9':
  Don't run large virtual displays through HWC

9 years agoam 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev
Dan Stoza [Thu, 30 Oct 2014 20:58:44 +0000 (20:58 +0000)]
am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev

* commit '7b97351b68e96ea67380140266abb897fe1be57d':
  Initialize ARect fields in default ctor

9 years agoam 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Jesse Hall [Thu, 30 Oct 2014 20:58:43 +0000 (20:58 +0000)]
am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT

* commit '1834f8ea975e9a882b44dc479320fe02e306e630':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT

9 years agoam 1f3efb11: Don\'t run large virtual displays through HWC
Dan Stoza [Thu, 30 Oct 2014 20:58:42 +0000 (20:58 +0000)]
am 1f3efb11: Don\'t run large virtual displays through HWC

* commit '1f3efb11ff8c884a254f4272f0d1ee0b77ceff2f':
  Don't run large virtual displays through HWC

9 years agoam d23b34b3: am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default...
Dan Stoza [Wed, 29 Oct 2014 23:13:10 +0000 (23:13 +0000)]
am d23b34b3: am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor"

* commit 'd23b34b3ac591d2c7bfb58bfc3ab673e775df496':
  Initialize ARect fields in default ctor

9 years agoam f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor"
Dan Stoza [Wed, 29 Oct 2014 23:08:21 +0000 (23:08 +0000)]
am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor"

* commit 'f3929d6611bb8278e561fdd4b05a21915ac9de76':
  Initialize ARect fields in default ctor

9 years agoam e42cba8f: Merge "Initialize ARect fields in default ctor"
Dan Stoza [Wed, 29 Oct 2014 23:04:05 +0000 (23:04 +0000)]
am e42cba8f: Merge "Initialize ARect fields in default ctor"

* commit 'e42cba8feb2bbfe385f162a06e41e2c2c0f40c99':
  Initialize ARect fields in default ctor

9 years agoMerge "Initialize ARect fields in default ctor"
Dan Stoza [Wed, 29 Oct 2014 22:58:47 +0000 (22:58 +0000)]
Merge "Initialize ARect fields in default ctor"

9 years agoInitialize ARect fields in default ctor
Dmitriy Ivanov [Tue, 28 Oct 2014 23:41:10 +0000 (16:41 -0700)]
Initialize ARect fields in default ctor

 So that we can use Rect() for update and such.

Bug: 18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f

9 years agoMerge "Initialize ARect fields in default ctor" into lmp-mr1-dev
Dan Stoza [Wed, 29 Oct 2014 18:32:49 +0000 (18:32 +0000)]
Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev

9 years agoGLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Jesse Hall [Wed, 6 Aug 2014 19:15:15 +0000 (12:15 -0700)]
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT

Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e1f7677cd41cd30f729ff66c7c21517)

9 years agoInitialize ARect fields in default ctor
Dmitriy Ivanov [Tue, 28 Oct 2014 23:41:10 +0000 (16:41 -0700)]
Initialize ARect fields in default ctor

 So that we can use Rect() for update and such.

Bug: 18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f

9 years agoDon't run large virtual displays through HWC
Dan Stoza [Wed, 15 Oct 2014 23:34:55 +0000 (16:34 -0700)]
Don't run large virtual displays through HWC

This change watches for a MAX_VIRTUAL_DISPLAY_DIMENSION value, which
will be set (if necessary) in BoardConfig.mk. If the value is set,
any virtual displays that have a width or a height greater than that
dimension will bypass the hardware composer HAL and be handled only
by SurfaceFlinger.

Bug: 17701816
Change-Id: Ia6ca44dfd6a7a9bc0f054493d3f13006bc32fa14

9 years agoam de0cdcd4: am 70ec2941: atrace: fix Sync Manager tracing preventing enabling of...
Patrick Auchter [Tue, 28 Oct 2014 07:28:32 +0000 (07:28 +0000)]
am de0cdcd4: am 70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing

* commit 'de0cdcd42c9d62b3df3e30163e281c6c056f7adf':
  atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing

9 years agoam 70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync...
Patrick Auchter [Tue, 28 Oct 2014 07:21:22 +0000 (07:21 +0000)]
am 70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing

* commit '70ec2941530766bdca09ef2983a3ff794c028ee6':
  atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing

9 years agoatrace: fix Sync Manager tracing preventing enabling of kernel sync tracing
Patrick Auchter [Tue, 30 Sep 2014 20:38:30 +0000 (15:38 -0500)]
atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing

Both Sync Manager tracing and kernel sync tracing were using "sync" to
enable tracing and since Sync Manager was found first, this prevented
enabling kernel sync tracing.

To fix this, use "syncman" to enable Sync Manager tracing.

Change-Id: Id3b799e01e5041c582cd752c8c40d3e36954f821
Signed-off-by: Iliyan Malchev <malchev@google.com>
9 years agoam 75b21462: am 5cf92d4a: am cb8a9fcc: Merge "Switch to libsigchain.a"
Dmitriy Ivanov [Mon, 27 Oct 2014 04:33:18 +0000 (04:33 +0000)]
am 75b21462: am 5cf92d4a: am cb8a9fcc: Merge "Switch to libsigchain.a"

* commit '75b21462584b64f89b7a19599ce051e2791cc9de':

9 years agoam 539be3bb: (-s ours) am f35a5ba6: (-s ours) am 649bafb7: Merge "bufferqueue: workar...
Jesse Hall [Mon, 27 Oct 2014 04:33:17 +0000 (04:33 +0000)]
am 539be3bb: (-s ours) am f35a5ba6: (-s ours) am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev

* commit '539be3bb5513210d3ed6bd956bbaddc51a756ea4':

9 years agoam f294e140: am 433fe2af: am 0b6acb22: Add version number to SensorService dump output.
Aravind Akella [Mon, 27 Oct 2014 04:33:17 +0000 (04:33 +0000)]
am f294e140: am 433fe2af: am 0b6acb22: Add version number to SensorService dump output.

* commit 'f294e1402efb2189fd0436035439b5c0d041b408':

9 years agoam b225fa3b: am 55833709: am c52e54c4: Merge "Some more test cleanup."
Dan Albert [Mon, 27 Oct 2014 04:33:16 +0000 (04:33 +0000)]
am b225fa3b: am 55833709: am c52e54c4: Merge "Some more test cleanup."

* commit 'b225fa3b59f6dbe8038f67fd4513c913a92c7457':

9 years agoam d13c57a4: am 97a3367a: Clean up unused parameter warnings.
Narayan Kamath [Mon, 27 Oct 2014 04:33:16 +0000 (04:33 +0000)]
am d13c57a4: am 97a3367a: Clean up unused parameter warnings.

* commit 'd13c57a485a5896ce16761e8b173f32ae5c47753':
  Clean up unused parameter warnings.

9 years agoam 3c746b7b: am 82ba423f: am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrapp...
Chih-hung Hsieh [Mon, 27 Oct 2014 04:33:15 +0000 (04:33 +0000)]
am 3c746b7b: am 82ba423f: am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"

* commit '3c746b7b7ce9a8a7623e6e6c6a79c97249f7ffac':

9 years agoam 093457a4: am 759115cd: am 9cc84950: Merge "Don\'t check if this == NULL."
Dan Albert [Mon, 27 Oct 2014 04:33:14 +0000 (04:33 +0000)]
am 093457a4: am 759115cd: am 9cc84950: Merge "Don\'t check if this == NULL."

* commit '093457a4fe9f8b77fbff58429c822ce00df67ea1':

9 years agoam ca50b6c5: am 0adea3b7: am 60fd3fee: Migrate CA certificates to all users
Robin Lee [Mon, 27 Oct 2014 04:33:14 +0000 (04:33 +0000)]
am ca50b6c5: am 0adea3b7: am 60fd3fee: Migrate CA certificates to all users

* commit 'ca50b6c516e4710bc144d967a1764149b0f743ab':

9 years agoam 5b829eb6: am 9b9d1a4e: am 26a28149: Merge "Link sigchain to surfaceflinger main...
Dmitriy Ivanov [Mon, 27 Oct 2014 04:33:13 +0000 (04:33 +0000)]
am 5b829eb6: am 9b9d1a4e: am 26a28149: Merge "Link sigchain to surfaceflinger main executable"

* commit '5b829eb6623ee66d8aecdeeeeabf46b50c946a9a':

9 years agoam 09a4bbda: am e7e61bef: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer
Lajos Molnar [Mon, 27 Oct 2014 04:33:12 +0000 (04:33 +0000)]
am 09a4bbda: am e7e61bef: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer

* commit '09a4bbdaf75a0cc9cece1ea30650ef2d1ca7f363':

9 years agoam c5c79f50: am 1222c894: am ffb49774: Improve ANR diagnostics.
Jeff Brown [Mon, 27 Oct 2014 04:33:12 +0000 (04:33 +0000)]
am c5c79f50: am 1222c894: am ffb49774: Improve ANR diagnostics.

* commit 'c5c79f50d0f434bd5bd6d7516e2177bc9f917338':

9 years agoam 7e5ecdc6: am 4335d35c: am 9ea09757: Fix broken error check in Parcel::readBlob
Narayan Kamath [Mon, 27 Oct 2014 04:33:11 +0000 (04:33 +0000)]
am 7e5ecdc6: am 4335d35c: am 9ea09757: Fix broken error check in Parcel::readBlob

* commit '7e5ecdc601096ccaf9ba7bb9f43829c81320904f':

9 years agoam ba8436fe: am a046f506: am 7830ef3d: Change ordering of memory allocation and calli...
Aravind Akella [Mon, 27 Oct 2014 04:33:10 +0000 (04:33 +0000)]
am ba8436fe: am a046f506: am 7830ef3d: Change ordering of memory allocation and calling Thread::run().

* commit 'ba8436feb62cebf4c191f89b8462e4f320c9921a':

9 years agoam 6df480d9: am 5cc3b8b4: am 78639c22: Merge "Parcel: extra validation/debug code...
Jesse Hall [Mon, 27 Oct 2014 04:33:09 +0000 (04:33 +0000)]
am 6df480d9: am 5cc3b8b4: am 78639c22: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev

* commit '6df480d989828cc0ee68297af9b6f2d70a7e8d7d':

9 years agoam 4c385eed: am 021543fc: am a7eb4b74: Merge "Fix sockfd leakage in SensorService...
Aravind Akella [Mon, 27 Oct 2014 04:33:09 +0000 (04:33 +0000)]
am 4c385eed: am 021543fc: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev

* commit '4c385eedff1bcfed45d2ed29e9f36f3317de7692':

9 years agoam 0e1e8ea3: am 8dcdf796: am 6747be9f: Generate the SurfaceFlinger shader cache on...
Riley Andrews [Mon, 27 Oct 2014 04:33:08 +0000 (04:33 +0000)]
am 0e1e8ea3: am 8dcdf796: am 6747be9f: Generate the SurfaceFlinger shader cache on initialization

* commit '0e1e8ea3376d5764c2cab2a0efb870c793dc1954':