OSDN Git Service
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.
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
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
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
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
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.
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
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
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
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
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
Michael Lentine [Fri, 31 Oct 2014 18:08:19 +0000 (11:08 -0700)]
Fix output of pointers for 64bit devices.
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
Jesse Hall [Fri, 31 Oct 2014 16:59:45 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wunused-parameter warning" 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
Jesse Hall [Fri, 31 Oct 2014 16:59:11 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Woverloaded-virtual warning" 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
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)
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)
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)
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)
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
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
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
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
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
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
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
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
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
Dan Stoza [Wed, 29 Oct 2014 22:58:47 +0000 (22:58 +0000)]
Merge "Initialize 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
Dan Stoza [Wed, 29 Oct 2014 18:32:49 +0000 (18:32 +0000)]
Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev
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)
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
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
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
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
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>
Dmitriy Ivanov [Mon, 27 Oct 2014 04:33:18 +0000 (04:33 +0000)]
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':
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':
Dan Albert [Mon, 27 Oct 2014 04:33:16 +0000 (04:33 +0000)]
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.
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':
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':
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':
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':
Lajos Molnar [Mon, 27 Oct 2014 04:33:12 +0000 (04:33 +0000)]
am
09a4bbda: am
e7e61bef: am
3454f123: media: add kMetadataBufferTypeGraphicBuffer
* commit '
09a4bbdaf75a0cc9cece1ea30650ef2d1ca7f363':
Jeff Brown [Mon, 27 Oct 2014 04:33:12 +0000 (04:33 +0000)]
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':
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':
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':
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':
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':
Jesse Hall [Mon, 27 Oct 2014 04:33:07 +0000 (04:33 +0000)]
am
16b65d40: am
0c2da971: am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
16b65d40755e2740f203577dba3142589c33f8a9':
Lajos Molnar [Mon, 27 Oct 2014 04:33:07 +0000 (04:33 +0000)]
am
09415821: am
be89b6f0: am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
09415821df8926bb5a1fdadd7ff6b6e241a4d626':
Michael Lentine [Mon, 27 Oct 2014 04:33:06 +0000 (04:33 +0000)]
am
acc9223e: am
df035b91: am
36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev
* commit '
acc9223e2e14b10ffe3af0755887cab188c806d9':
Christopher Ferris [Mon, 27 Oct 2014 04:33:05 +0000 (04:33 +0000)]
am
79108f28: am
f625a249: am
a91968fd: Merge "Accept socket connection before tracing." into lmp-dev
* commit '
79108f28d7d3b446867ad5e218554ac5b0486287':
Michael Lentine [Mon, 27 Oct 2014 04:33:05 +0000 (04:33 +0000)]
am
ae22c20a: am
20daf003: am
db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
* commit '
ae22c20a5b1df8e786240b009261b0c86d94a608':
Chong Zhang [Mon, 27 Oct 2014 04:33:04 +0000 (04:33 +0000)]
am
a9100fcd: am
30e4b31a: am
dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev
* commit '
a9100fcd369d4373b76f35cf999e0ac760d8c87c':
Jesse Hall [Mon, 27 Oct 2014 04:33:03 +0000 (04:33 +0000)]
am
27f82279: am
e245cdcc: am
5bf786d8: surfaceflinger: recompute visibility after sideband stream change
* commit '
27f822797781d2dae5d37babc91d408a4213c184':
Narayan Kamath [Mon, 27 Oct 2014 04:33:03 +0000 (04:33 +0000)]
am
4c2a89d7: am
28da3288: am
cde4b13a: Merge "Allow more than one dex2oat extra option"
* commit '
4c2a89d710731799b141622e4d546a01e2186856':
Dianne Hackborn [Mon, 27 Oct 2014 04:33:02 +0000 (04:33 +0000)]
am
66b3fc32: am
e4499526: am
5ee2c9d2: Work on issue #
17656716: Unhandled exception in Window Manager
* commit '
66b3fc326e524b14a39613ad72863629a5b1714a':
Aravind Akella [Mon, 27 Oct 2014 04:33:02 +0000 (04:33 +0000)]
am
8adf97b1: am
112a7457: am
deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev
* commit '
8adf97b1466cb29ef90753fa6d950a57cd1bf74a':
Jesse Hall [Mon, 27 Oct 2014 04:33:01 +0000 (04:33 +0000)]
am
505bc90d: am
2a8ae4ef: am
bacc28ef: surfaceflinger: Use landscape resolution for default dpi
* commit '
505bc90d8fffb6cbe262ea0550241f44705f728f':
Aravind Akella [Mon, 27 Oct 2014 04:33:01 +0000 (04:33 +0000)]
am
ee482b11: 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 '
ee482b116eafe5b835638a12269c8d1943a54a4d':
Michael Wright [Mon, 27 Oct 2014 04:33:00 +0000 (04:33 +0000)]
am
96436499: am
cfbc3654: am
4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
* commit '
96436499348db8a3131b49a1ef4b4d0b9c472bc7':
Jesse Hall [Mon, 27 Oct 2014 04:32:59 +0000 (04:32 +0000)]
am
354ea330: am
1b5c8839: am
728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
* commit '
354ea330a048b23658df27adaaa09f92ccd3c948':
Aravind Akella [Mon, 27 Oct 2014 04:32:59 +0000 (04:32 +0000)]
am
5c89b832: am
8b4869dc: am
5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
* commit '
5c89b832f5dc1b3b7137e98aeb11eeb404fba257':
Michael Lentine [Mon, 27 Oct 2014 04:32:58 +0000 (04:32 +0000)]
am
eb8191bf: am
53bffaaf: am
12c4bdad: Add rate-limited logging for unimplemented es functions.
* commit '
eb8191bfd229e30109c485b6b3f07ea653a28754':
Dan Albert [Mon, 27 Oct 2014 04:32:58 +0000 (04:32 +0000)]
Lorenzo Colitti [Mon, 27 Oct 2014 04:32:57 +0000 (04:32 +0000)]
am
9664ba14: am
7a99e281: am
d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
* commit '
9664ba1469f5c7633e732c78002c7f84736884cf':
Sean Wan [Mon, 27 Oct 2014 04:32:57 +0000 (04:32 +0000)]
am
d785677d: am
0c6e249c: am
b1982b75: am
60d31a0f: am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
d785677d3a327ff050a140bb6aa4b41a3326ce9f':
Lajos Molnar [Mon, 27 Oct 2014 04:32:56 +0000 (04:32 +0000)]
am
e98c13ed: am
435d9cde: resolved conflicts for merge of
67d8bd66 to lmp-dev-plus-aosp
* commit '
e98c13ed66d4c1662e630c242ccfac8fe7274de5':
Unsuk Jung [Mon, 27 Oct 2014 04:32:55 +0000 (04:32 +0000)]
am
ef04c721: am
556888b8: am
5bbf73ce: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
* commit '
ef04c72130f90646b046fb6e3484f0216ff211b5':
Aravind Akella [Mon, 27 Oct 2014 04:32:55 +0000 (04:32 +0000)]
am
8509db4b: am
c8a1b367: am
e225f6fd: Merge "SensorService fixes." into lmp-dev
* commit '
8509db4b4a1f643b36c884323a3d119b4e5ea138':
Ihab Awad [Mon, 27 Oct 2014 04:32:54 +0000 (04:32 +0000)]
am
b30d46dc: am
9b1543ad: am
5430cead: Add system feature for ConnectionService API support (2/3)
* commit '
b30d46dc2d967ccf086a1d94cbaebc3b290209b0':
Dmitriy Ivanov [Mon, 27 Oct 2014 04:18:33 +0000 (04:18 +0000)]
Jesse Hall [Mon, 27 Oct 2014 04:18:33 +0000 (04:18 +0000)]
am
f35a5ba6: (-s ours) am
649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
* commit '
f35a5ba664f53813c2fb7c903e5f4809ad029569':
Aravind Akella [Mon, 27 Oct 2014 04:18:32 +0000 (04:18 +0000)]
am
433fe2af: am
0b6acb22: Add version number to SensorService dump output.
* commit '
433fe2af0dd9a895cbe65ac5d5b9cb68c5924d8a':
Dan Albert [Mon, 27 Oct 2014 04:18:32 +0000 (04:18 +0000)]
Narayan Kamath [Mon, 27 Oct 2014 04:18:31 +0000 (04:18 +0000)]
am
97a3367a: Clean up unused parameter warnings.
* commit '
97a3367a1b49b1761e3485765b2bd3f2293f9638':
Clean up unused parameter warnings.
Chih-hung Hsieh [Mon, 27 Oct 2014 04:18:31 +0000 (04:18 +0000)]
am
82ba423f: am
e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
* commit '
82ba423f1ca6b05956cc82ecb12da8e5048fa645':
Dan Albert [Mon, 27 Oct 2014 04:18:30 +0000 (04:18 +0000)]
am
759115cd: am
9cc84950: Merge "Don\'t check if this == NULL."
* commit '
759115cd6d6e4f7909342e25f1002a9d74ceee5e':
Robin Lee [Mon, 27 Oct 2014 04:18:29 +0000 (04:18 +0000)]
am
0adea3b7: am
60fd3fee: Migrate CA certificates to all users
* commit '
0adea3b792ecddab7dbb450135e04d6736e872c6':
Dmitriy Ivanov [Mon, 27 Oct 2014 04:18:29 +0000 (04:18 +0000)]
am
9b9d1a4e: am
26a28149: Merge "Link sigchain to surfaceflinger main executable"
* commit '
9b9d1a4ee54817028549e3b3c49f5c9898b11406':
Lajos Molnar [Mon, 27 Oct 2014 04:18:28 +0000 (04:18 +0000)]
am
e7e61bef: am
3454f123: media: add kMetadataBufferTypeGraphicBuffer
* commit '
e7e61beffc8be64f604781d7b7ea96828bbb554d':
Jeff Brown [Mon, 27 Oct 2014 04:18:28 +0000 (04:18 +0000)]
Narayan Kamath [Mon, 27 Oct 2014 04:18:27 +0000 (04:18 +0000)]
am
4335d35c: am
9ea09757: Fix broken error check in Parcel::readBlob
* commit '
4335d35c71e777d42fbe8d53fa6b8fbc95d4c2b7':
Aravind Akella [Mon, 27 Oct 2014 04:18:26 +0000 (04:18 +0000)]
am
a046f506: am
7830ef3d: Change ordering of memory allocation and calling Thread::run().
* commit '
a046f506a52aa8fd0fe193b18fe283da83107f09':
Jesse Hall [Mon, 27 Oct 2014 04:18:26 +0000 (04:18 +0000)]
am
5cc3b8b4: am
78639c22: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
* commit '
5cc3b8b4c81c6e157f540a27e70559ee034e313d':
Aravind Akella [Mon, 27 Oct 2014 04:18:25 +0000 (04:18 +0000)]
am
021543fc: am
a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev
* commit '
021543fc657a7f21d1b143c68258282b35262906':
Riley Andrews [Mon, 27 Oct 2014 04:18:24 +0000 (04:18 +0000)]
am
8dcdf796: am
6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '
8dcdf7961b22ad36cb43d0f5353a1b5663448fd4':
Jesse Hall [Mon, 27 Oct 2014 04:18:24 +0000 (04:18 +0000)]
am
0c2da971: am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
0c2da9719bde37305c5724e54f97a8f61c7e8d0b':
Lajos Molnar [Mon, 27 Oct 2014 04:18:23 +0000 (04:18 +0000)]
am
be89b6f0: am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
be89b6f0846d0ede5e6a4fed6115298285cdab60':
Michael Lentine [Mon, 27 Oct 2014 04:18:22 +0000 (04:18 +0000)]
am
df035b91: am
36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev
* commit '
df035b91df50cf8a308121c43a2660f403b257ee':
Christopher Ferris [Mon, 27 Oct 2014 04:18:22 +0000 (04:18 +0000)]
am
f625a249: am
a91968fd: Merge "Accept socket connection before tracing." into lmp-dev
* commit '
f625a249b9a0de54eedf3fa0aaa549c1fb568298':
Michael Lentine [Mon, 27 Oct 2014 04:18:21 +0000 (04:18 +0000)]
am
20daf003: am
db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
* commit '
20daf003aaf1f01d5ef3cd60306db3cff89512c8':
Chong Zhang [Mon, 27 Oct 2014 04:18:20 +0000 (04:18 +0000)]
am
30e4b31a: am
dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev
* commit '
30e4b31a8e3d189934842487f81cbbca8f74cbae':
Jesse Hall [Mon, 27 Oct 2014 04:18:20 +0000 (04:18 +0000)]
am
e245cdcc: am
5bf786d8: surfaceflinger: recompute visibility after sideband stream change
* commit '
e245cdcc004ee13920aa0b74790a2b5c758662a2':