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

51496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
0684ff9e65 am bc11bbf2: am 7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 
* commit 'bc11bbf2f0bd38c0f271cb95c138a48d5d9a085b':
  Initialize ARect fields in default ctor
 2014-10-30 21:06:48 +00:00
Jesse Hall
82f3d66b1a am f12f1550: am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
* commit 'f12f15502a3092a9f7f28cf45b1a00e2efbd6eac':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
 2014-10-30 21:06:47 +00:00
Dan Stoza
30d382613e am d7702163: am 1f3efb11: Don\'t run large virtual displays through HWC 
* commit 'd77021637e28e66be3fcc097b16869df69717df9':
  Don't run large virtual displays through HWC
 2014-10-30 21:06:46 +00: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
298e6f92a4 am d23b34b3: am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor" 
* commit 'd23b34b3ac591d2c7bfb58bfc3ab673e775df496':
  Initialize ARect fields in default ctor
 2014-10-29 23:13:10 +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
a3f809cb0c 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
 2014-10-28 07:28:32 +00: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
9edf4b3095 am 75b21462: am 5cf92d4a: am cb8a9fcc: Merge "Switch to libsigchain.a" 
* commit '75b21462584b64f89b7a19599ce051e2791cc9de':
 2014-10-27 04:33:18 +00:00
Jesse Hall
7715bce12c 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':
 2014-10-27 04:33:17 +00:00
Aravind Akella
46a8918f4e am f294e140: am 433fe2af: am 0b6acb22: Add version number to SensorService dump output. 
* commit 'f294e1402efb2189fd0436035439b5c0d041b408':
 2014-10-27 04:33:17 +00:00
Dan Albert
23c109b3b3 am b225fa3b: am 55833709: am c52e54c4: Merge "Some more test cleanup." 
* commit 'b225fa3b59f6dbe8038f67fd4513c913a92c7457':
 2014-10-27 04:33:16 +00:00
Narayan Kamath
70d6b0977a am d13c57a4: am 97a3367a: Clean up unused parameter warnings. 
* commit 'd13c57a485a5896ce16761e8b173f32ae5c47753':
  Clean up unused parameter warnings.
 2014-10-27 04:33:16 +00:00
Chih-hung Hsieh
4a55c51b76 am 3c746b7b: am 82ba423f: am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit '3c746b7b7ce9a8a7623e6e6c6a79c97249f7ffac':
 2014-10-27 04:33:15 +00:00
Dan Albert
b46697b7ae am 093457a4: am 759115cd: am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '093457a4fe9f8b77fbff58429c822ce00df67ea1':
 2014-10-27 04:33:14 +00:00
Robin Lee
a16ced885e am ca50b6c5: am 0adea3b7: am 60fd3fee: Migrate CA certificates to all users 
* commit 'ca50b6c516e4710bc144d967a1764149b0f743ab':
 2014-10-27 04:33:14 +00:00
Dmitriy Ivanov
430f18f6e4 am 5b829eb6: am 9b9d1a4e: am 26a28149: Merge "Link sigchain to surfaceflinger main executable" 
* commit '5b829eb6623ee66d8aecdeeeeabf46b50c946a9a':
 2014-10-27 04:33:13 +00:00
Lajos Molnar
dfa5098cea am 09a4bbda: am e7e61bef: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer 
* commit '09a4bbdaf75a0cc9cece1ea30650ef2d1ca7f363':
 2014-10-27 04:33:12 +00:00
Jeff Brown
8feb9128ad am c5c79f50: am 1222c894: am ffb49774: Improve ANR diagnostics. 
* commit 'c5c79f50d0f434bd5bd6d7516e2177bc9f917338':
 2014-10-27 04:33:12 +00:00
Narayan Kamath
5af64ec9fc am 7e5ecdc6: am 4335d35c: am 9ea09757: Fix broken error check in Parcel::readBlob 
* commit '7e5ecdc601096ccaf9ba7bb9f43829c81320904f':
 2014-10-27 04:33:11 +00:00
Aravind Akella
06469f4688 am ba8436fe: am a046f506: am 7830ef3d: Change ordering of memory allocation and calling Thread::run(). 
* commit 'ba8436feb62cebf4c191f89b8462e4f320c9921a':
 2014-10-27 04:33:10 +00:00
Jesse Hall
b801194e20 am 6df480d9: am 5cc3b8b4: am 78639c22: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev 
* commit '6df480d989828cc0ee68297af9b6f2d70a7e8d7d':
 2014-10-27 04:33:09 +00:00
Aravind Akella
76c77d6c3a am 4c385eed: am 021543fc: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev 
* commit '4c385eedff1bcfed45d2ed29e9f36f3317de7692':
 2014-10-27 04:33:09 +00:00
Riley Andrews
d3278fcf04 am 0e1e8ea3: am 8dcdf796: am 6747be9f: Generate the SurfaceFlinger shader cache on initialization 
* commit '0e1e8ea3376d5764c2cab2a0efb870c793dc1954':
 2014-10-27 04:33:08 +00:00