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

51214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Robin Lee
ca50b6c516 am 0adea3b7: am 60fd3fee: Migrate CA certificates to all users 
* commit '0adea3b792ecddab7dbb450135e04d6736e872c6':
 2014-10-27 04:18:29 +00:00
Dmitriy Ivanov
5b829eb662 am 9b9d1a4e: am 26a28149: Merge "Link sigchain to surfaceflinger main executable" 
* commit '9b9d1a4ee54817028549e3b3c49f5c9898b11406':
 2014-10-27 04:18:29 +00:00
Lajos Molnar
09a4bbdaf7 am e7e61bef: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer 
* commit 'e7e61beffc8be64f604781d7b7ea96828bbb554d':
 2014-10-27 04:18:28 +00:00
Jeff Brown
c5c79f50d0 am 1222c894: am ffb49774: Improve ANR diagnostics. 
* commit '1222c8944aaa729a54b61496ac125747a31cf5f5':
 2014-10-27 04:18:28 +00:00
Narayan Kamath
7e5ecdc601 am 4335d35c: am 9ea09757: Fix broken error check in Parcel::readBlob 
* commit '4335d35c71e777d42fbe8d53fa6b8fbc95d4c2b7':
 2014-10-27 04:18:27 +00:00
Aravind Akella
ba8436feb6 am a046f506: am 7830ef3d: Change ordering of memory allocation and calling Thread::run(). 
* commit 'a046f506a52aa8fd0fe193b18fe283da83107f09':
 2014-10-27 04:18:26 +00:00
Jesse Hall
6df480d989 am 5cc3b8b4: am 78639c22: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev 
* commit '5cc3b8b4c81c6e157f540a27e70559ee034e313d':
 2014-10-27 04:18:26 +00:00
Aravind Akella
4c385eedff am 021543fc: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev 
* commit '021543fc657a7f21d1b143c68258282b35262906':
 2014-10-27 04:18:25 +00:00
Riley Andrews
0e1e8ea337 am 8dcdf796: am 6747be9f: Generate the SurfaceFlinger shader cache on initialization 
* commit '8dcdf7961b22ad36cb43d0f5353a1b5663448fd4':
 2014-10-27 04:18:24 +00:00
Jesse Hall
16b65d4075 am 0c2da971: am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev 
* commit '0c2da9719bde37305c5724e54f97a8f61c7e8d0b':
 2014-10-27 04:18:24 +00:00
Lajos Molnar
09415821df am be89b6f0: am 0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev 
* commit 'be89b6f0846d0ede5e6a4fed6115298285cdab60':
 2014-10-27 04:18:23 +00:00
Michael Lentine
acc9223e2e am df035b91: am 36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev 
* commit 'df035b91df50cf8a308121c43a2660f403b257ee':
 2014-10-27 04:18:22 +00:00
Christopher Ferris
79108f28d7 am f625a249: am a91968fd: Merge "Accept socket connection before tracing." into lmp-dev 
* commit 'f625a249b9a0de54eedf3fa0aaa549c1fb568298':
 2014-10-27 04:18:22 +00:00
Michael Lentine
ae22c20a5b am 20daf003: am db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev 
* commit '20daf003aaf1f01d5ef3cd60306db3cff89512c8':
 2014-10-27 04:18:21 +00:00
Chong Zhang
a9100fcd36 am 30e4b31a: am dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev 
* commit '30e4b31a8e3d189934842487f81cbbca8f74cbae':
 2014-10-27 04:18:20 +00:00
Jesse Hall
27f8227977 am e245cdcc: am 5bf786d8: surfaceflinger: recompute visibility after sideband stream change 
* commit 'e245cdcc004ee13920aa0b74790a2b5c758662a2':
 2014-10-27 04:18:20 +00:00
Narayan Kamath
4c2a89d710 am 28da3288: am cde4b13a: Merge "Allow more than one dex2oat extra option" 
* commit '28da32889bad10835eedd2a6c8ee50591b17e4e2':
 2014-10-27 04:18:19 +00:00
Dianne Hackborn
66b3fc326e am e4499526: am 5ee2c9d2: Work on issue #17656716: Unhandled exception in Window Manager 
* commit 'e4499526eee52a6584aba9382783e9fba327a9bc':
 2014-10-27 04:18:17 +00:00
Aravind Akella
8adf97b146 am 112a7457: am deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev 
* commit '112a7457aedc694de9ba06359e738893e28c640a':
 2014-10-27 04:18:17 +00:00
Jesse Hall
505bc90d8f am 2a8ae4ef: am bacc28ef: surfaceflinger: Use landscape resolution for default dpi 
* commit '2a8ae4ef70f2a3e0239a4df9bf33b4ff141594fe':
 2014-10-27 04:18:16 +00:00
Aravind Akella
ee482b116e am bea1db57: am 71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev 
* commit 'bea1db57deb3488fe3eb8c3f74ed05c64a5710bf':
 2014-10-27 04:18:15 +00:00
Michael Wright
9643649934 am cfbc3654: am 4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev 
* commit 'cfbc36544e8856d49d86f61de1a0815ceef4d395':
 2014-10-27 04:18:15 +00:00
Jesse Hall
354ea330a0 am 1b5c8839: am 728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev 
* commit '1b5c8839f7bbdebb3b30a6584e67402e8cb4a979':
 2014-10-27 04:18:14 +00:00
Aravind Akella
5c89b832f5 am 8b4869dc: am 5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections. 
* commit '8b4869dc832b098bd8de1fb20bf36ff8ae9c4d28':
 2014-10-27 04:18:14 +00:00