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

51238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Jesse Hall
c7636f6062 Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 2014-10-31 16:59:26 +00:00
Jesse Hall
6e74e3ccd9 Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 2014-10-31 16:59:11 +00:00
Jesse Hall
04c9683aa1 Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev 2014-10-31 16:58:45 +00:00
Jesse Hall
7cd85979e8 surfaceflinger: fix -Wunused-parameter warning 
warning: unused parameter 'mustRecompose' [-Wunused-parameter]

Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f717)
 2014-10-31 09:52:42 -07:00
Jesse Hall
7844211607 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 f9bfdc6c94)
 2014-10-31 09:52:23 -07:00
Jesse Hall
9b901805ed surfaceflinger: fix -Woverloaded-virtual warning 
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]

Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116)
 2014-10-31 09:52:08 -07:00
Jesse Hall
1495ceb885 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 646f541050)
 2014-10-31 09:51:10 -07:00
Dan Stoza
bc11bbf2f0 am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 
* commit '7b97351b68e96ea67380140266abb897fe1be57d':
  Initialize ARect fields in default ctor
 2014-10-30 20:58:44 +00:00
Jesse Hall
f12f15502a am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
* commit '1834f8ea975e9a882b44dc479320fe02e306e630':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
 2014-10-30 20:58:43 +00:00
Dan Stoza
d77021637e am 1f3efb11: Don\'t run large virtual displays through HWC 
* commit '1f3efb11ff8c884a254f4272f0d1ee0b77ceff2f':
  Don't run large virtual displays through HWC
 2014-10-30 20:58:42 +00:00
Dan Stoza
d23b34b3ac am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor" 
* commit 'f3929d6611bb8278e561fdd4b05a21915ac9de76':
  Initialize ARect fields in default ctor
 2014-10-29 23:08:21 +00:00
Dan Stoza
f3929d6611 am e42cba8f: Merge "Initialize ARect fields in default ctor" 
* commit 'e42cba8feb2bbfe385f162a06e41e2c2c0f40c99':
  Initialize ARect fields in default ctor
 2014-10-29 23:04:05 +00:00
Dan Stoza
e42cba8feb Merge "Initialize ARect fields in default ctor" 2014-10-29 22:58:49 +00:00
Dmitriy Ivanov
bccab86174 Initialize ARect fields in default ctor 
So that we can use Rect() for update and such.

Bug: 18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
 2014-10-29 15:48:28 -07:00
Dan Stoza
7b97351b68 Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 2014-10-29 18:32:49 +00:00
Jesse Hall
1834f8ea97 GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e)
 2014-10-29 17:15:09 +00:00
Dmitriy Ivanov
b2e19208dd Initialize ARect fields in default ctor 
So that we can use Rect() for update and such.

Bug: 18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
 2014-10-28 16:41:10 -07:00
Dan Stoza
1f3efb11ff 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
 2014-10-28 16:01:47 -07:00
Patrick Auchter
de0cdcd42c 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
 2014-10-28 07:21:22 +00:00
Patrick Auchter
70ec294153 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>
 2014-10-27 13:07:58 -07:00
Dmitriy Ivanov
75b2146258 am 5cf92d4a: am cb8a9fcc: Merge "Switch to libsigchain.a" 
* commit '5cf92d4a85efe7bcff4d0818d8d88afa252f7cc7':
 2014-10-27 04:18:33 +00:00
Jesse Hall
539be3bb55 am f35a5ba6: (-s ours) am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit 'f35a5ba664f53813c2fb7c903e5f4809ad029569':
 2014-10-27 04:18:33 +00:00
Aravind Akella
f294e1402e am 433fe2af: am 0b6acb22: Add version number to SensorService dump output. 
* commit '433fe2af0dd9a895cbe65ac5d5b9cb68c5924d8a':
 2014-10-27 04:18:32 +00:00
Dan Albert
b225fa3b59 am 55833709: am c52e54c4: Merge "Some more test cleanup." 
* commit '55833709ab4b8e6f85d19be0a5b1a096277a2dc2':
 2014-10-27 04:18:32 +00:00
Narayan Kamath
d13c57a485 am 97a3367a: Clean up unused parameter warnings. 
* commit '97a3367a1b49b1761e3485765b2bd3f2293f9638':
  Clean up unused parameter warnings.
 2014-10-27 04:18:31 +00:00
Chih-hung Hsieh
3c746b7b7c am 82ba423f: am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit '82ba423f1ca6b05956cc82ecb12da8e5048fa645':
 2014-10-27 04:18:31 +00:00
Dan Albert
093457a4fe am 759115cd: am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '759115cd6d6e4f7909342e25f1002a9d74ceee5e':
 2014-10-27 04:18:30 +00:00