ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,538 Commits 2 Branches 0 Tags 54 MiB
Commit Graph

51538 Commits

Author SHA1 Message Date
Jeff Tinker cbd9e8d34c am 52211048: am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit '522110485465a05f4602ad42ba14a18b11184cca':
  Add missing secure stop methods
 2014-11-06 02:48:18 +00:00
Jeff Tinker 5221104854 am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev 
* commit '621c6f3b13f96b0e84163f355c6f3024cd3afb2e':
  Add missing secure stop methods
 2014-11-06 02:44:25 +00:00
Jeff Tinker 621c6f3b13 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:31 +00:00
Michael Lentine 585cccc7ff 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.
 2014-11-05 20:11:32 +00:00
Michael Lentine a2f27a0d63 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.
 2014-11-05 19:06:19 +00:00
Michael Lentine 2664529840 Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev 2014-11-05 18:58:22 +00:00
Dan Albert c954a121e1 Add a missing include. 
Was being included transitively by stlport.

Bug: 15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378
 2014-11-04 22:31:05 -08:00
Dan Albert 66aae0a4c8 am 090dbeb7: am c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++." 
* commit '090dbeb7f174e5c1c605d8d91ef0faa2c46e9ee3':
  Move hwc tests to libc++.
 2014-11-05 03:29:55 +00:00
Dan Albert 090dbeb7f1 am c90b7d9c: am d12586b8: Merge "Move hwc tests to libc++." 
* commit 'c90b7d9c0f1df1cec8afbfebad0f111d878113e7':
  Move hwc tests to libc++.
 2014-11-05 02:57:31 +00:00
Dan Albert c90b7d9c0f am d12586b8: Merge "Move hwc tests to libc++." 
* commit 'd12586b8593cf0cb894d02104a9794ed9dd85d16':
  Move hwc tests to libc++.
 2014-11-05 02:41:59 +00:00
Dan Albert d12586b859 Merge "Move hwc tests to libc++." 2014-11-05 01:38:09 +00:00
Dan Albert bcc1ae07d9 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
 2014-11-04 17:25:12 -08:00
Mark Salyzyn 1fd0695a3b am ea14602e: am 9cea6ccb: dumpstate: report device uptime mmc performance 
* commit 'ea14602e6e1e415f3c6b53ef498d4deff00c23ac':
  dumpstate: report device uptime mmc performance
 2014-11-05 00:21:48 +00:00
Mark Salyzyn ea14602e6e am 9cea6ccb: dumpstate: report device uptime mmc performance 
* commit '9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c':
  dumpstate: report device uptime mmc performance
 2014-11-05 00:15:47 +00:00
Jesse Hall 6eb6b9fd8c am 06ce1094: am fee99040: Revert "Add more logging for dup(fd) failure" 
* commit '06ce1094706bb0856f6cc876e1f5276adc642446':
  Revert "Add more logging for dup(fd) failure"
 2014-11-04 17:40:28 +00:00
Jesse Hall eab3e59f8b am 88361aaa: am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
* commit '88361aaaf4f2339f50dc32438a261283c642d471':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
 2014-11-04 17:40:27 +00:00
Jesse Hall f8a2f73991 am aa4ccfd1: am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" 
* commit 'aa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e':
  Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
 2014-11-04 17:40:27 +00:00
Mark Salyzyn 9cea6ccbd8 dumpstate: report device uptime mmc performance 
Bug: 18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121
 2014-11-04 09:39:27 -08:00
Jesse Hall 06ce109470 am fee99040: Revert "Add more logging for dup(fd) failure" 
* commit 'fee99040de000a64f6036a7db172fb7c68d9764a':
  Revert "Add more logging for dup(fd) failure"
 2014-11-04 17:35:23 +00:00
Jesse Hall 88361aaaf4 am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
* commit '8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
 2014-11-04 17:35:23 +00:00
Jesse Hall aa4ccfd123 am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" 
* commit 'de288fe2d43adfa1b2243ae534faaf832bf50491':
  Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
 2014-11-04 17:35:22 +00:00
Jesse Hall fee99040de Revert "Add more logging for dup(fd) failure" 
Underlying bug has been fixed, extra debug code no longer needed

This reverts commit 36273c991b.

Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
 2014-11-04 08:48:16 -08:00
Jesse Hall 8e5cf83afb Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
Underlying bug has been fixed, extra debug code no longer needed.

This reverts commit ccf851f108.

Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
 2014-11-04 08:47:57 -08:00
Jesse Hall de288fe2d4 Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" 
Underlying bug has been fixed, workaround no longer needed

This reverts commit 5b0cbcf946.

Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
 2014-11-04 08:47:37 -08:00
Chih-Hung Hsieh 4c1482acb1 am 923b0f6a: am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang." 
* commit '923b0f6a6787462509c23349ac04b8e9360c51cc':
  Avoid two warnings from clang.
 2014-11-04 02:09:30 +00:00
Chih-Hung Hsieh 923b0f6a67 am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'ac5cd96fe24690d9e0ae823c77334b8579139aa2':
  Avoid two warnings from clang.
 2014-11-04 01:58:17 +00:00
Chih-Hung Hsieh ac5cd96fe2 am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
  Avoid two warnings from clang.
 2014-11-04 01:24:07 +00:00
Naseer Ahmed 1b89fe0b81 am ff520bb9: am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs 
* commit 'ff520bb93812f9892da526ace81efce9b0872503':
  sf: Add a NULL check in getDisplayConfigs
 2014-11-04 01:18:08 +00:00
Chih-Hung Hsieh dbab409c49 Merge "Avoid two warnings from clang." 2014-11-04 01:14:17 +00:00
Naseer Ahmed ff520bb938 am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs 
* commit '7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
  sf: Add a NULL check in getDisplayConfigs
 2014-11-03 22:31:50 +00:00
Michael Lentine dfd06b89a4 Fix for corruption when numFds or numInts is too large. 
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
 2014-11-03 14:08:54 -08:00
Naseer Ahmed 7aa0c47e42 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>
 2014-11-03 12:16:18 -08:00
Michael Lentine 001ed44536 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.
 2014-11-01 00:41:16 +00:00
Michael Lentine 54430ca2a8 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.
 2014-11-01 00:33:29 +00:00
Michael Lentine 793fc0e13d Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 2014-10-31 23:37:47 +00:00
Michael Lentine 8afa1c4ab8 Fix crash when user provides large values in the Parcel. 
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
 2014-10-31 16:08:44 -07:00
Michael Lentine fb66335bcc 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.
 2014-10-31 23:07:01 +00:00
Jesse Hall d8ad444c32 am b43a1c9b: am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 
* commit 'b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e':
  surfaceflinger: fix -Wunused-parameter warning
 2014-10-31 23:07:01 +00:00
Jesse Hall d792acc531 am 18b846dd: am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 
* commit '18b846dda798709796be078a7978d885685df9a4':
  surfaceflinger: fix -Wsign-compare warnings
 2014-10-31 23:07:00 +00:00
Jesse Hall 8864e3e6cc am 9fc06c5e: am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 
* commit '9fc06c5e2131cdf0d76a3838215c057f57da67e3':
  surfaceflinger: fix -Woverloaded-virtual warning
 2014-10-31 23:06:59 +00:00
Jesse Hall c091c0e945 am 31705817: resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp 
* commit '3170581704fa59a8672262c0e6c68f455d470214':
  surfaceflinger: fix -Wmismatched-tags warnings
 2014-10-31 22:58:46 +00:00
Michael Lentine 078794ed37 am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 
* commit '9853685931298ba02066ebb50a8377ad4aa80f00':
  Fix output of pointers for 64bit devices.
 2014-10-31 22:58:19 +00:00
Jesse Hall b43a1c9be2 am affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 
* commit 'affc4d809edbcb3b0e49e5ccc9821b9695a57d44':
  surfaceflinger: fix -Wunused-parameter warning
 2014-10-31 22:57:44 +00:00
Jesse Hall 18b846dda7 am c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 
* commit 'c7636f606270a4b79d745ec1acf049daedfa0e2f':
  surfaceflinger: fix -Wsign-compare warnings
 2014-10-31 22:57:43 +00:00
Jesse Hall 9fc06c5e21 am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 
* commit '6e74e3ccd972fe90d9998f6b683e25dca38f470d':
  surfaceflinger: fix -Woverloaded-virtual warning
 2014-10-31 22:57:42 +00:00
Jesse Hall 3170581704 resolved conflicts for merge of 04c9683a to lmp-mr1-dev-plus-aosp 
Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0
 2014-10-31 15:53:38 -07:00
Michael Lentine 9853685931 Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 2014-10-31 18:39:23 +00:00
Chih-Hung Hsieh 8e5337de2c 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
 2014-10-31 18:38:00 +00:00
Michael Lentine fae12d4fb4 Fix output of pointers for 64bit devices. 
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
 2014-10-31 11:08:19 -07:00
Jesse Hall affc4d809e Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 2014-10-31 16:59:45 +00:00