Dianne Hackborn
1962f65137
Merge "Follow framework change to track started ops by proc."
2013-07-18 18:13:14 +00:00
Dianne Hackborn
913b63d235
Follow framework change to track started ops by proc.
...
Change-Id: Ibbce3bf6556f45751c74bab045b46377e56bff9b
2013-07-17 17:26:15 -07:00
Lajos Molnar
3ec92e1ad7
Merge "Clarify some android-specific OMX extensions for native buffers."
2013-07-17 22:30:28 +00:00
Lajos Molnar
5f39f6043d
Clarify some android-specific OMX extensions for native buffers.
...
Clarify the use of enableAndroidNativeBuffers and
storeMetaDataInBuffers extensions.
Change-Id: Ia1ca4a262525de74f133619f92ef6ba8271a6f72
Signed-off-by: Lajos Molnar <lajos@google.com>
2013-07-17 15:12:27 -07:00
Jesse Hall
ba3ed90b09
am 082fc1ca
: am ae961022
: Merge "EGL: Fix error for eglCreateWindowSurface"
...
* commit '082fc1cae6a0c283de3ad0d848e0757de3154d0b':
EGL: Fix error for eglCreateWindowSurface
2013-07-17 14:13:56 -07:00
Jesse Hall
082fc1cae6
am ae961022
: Merge "EGL: Fix error for eglCreateWindowSurface"
...
* commit 'ae9610220b5f509687b840532f95f3638ee0146b':
EGL: Fix error for eglCreateWindowSurface
2013-07-17 14:10:00 -07:00
Jesse Hall
ae9610220b
Merge "EGL: Fix error for eglCreateWindowSurface"
2013-07-17 21:06:54 +00:00
Jonathan Hamilton
77a9b4a6bd
EGL: Fix error for eglCreateWindowSurface
...
The EGL 1.4 spec section 3.5.1 states that EGL_BAD_ALLOC should be set
if the supplied window already has an associated EGLSurface, not
EGL_BAD_NATIVE_WINDOW as is currently set.
Change-Id: If1598617f4e31904f2045560ae1cdf49d8a697dc
2013-07-17 09:52:41 -07:00
Jean-Baptiste Queru
0e615634de
am 384f55ff
: (-s ours) Merge "Tweaks for forward compatibility" into stage-aosp-master
...
* commit '384f55fff01a9d0630b801abd016b82ded4c5984':
Tweaks for forward compatibility
2013-07-16 15:36:08 -07:00
Chad Brubaker
33510c07f3
Add C++ library for ConnectivityManager
...
Add C++ library for access to ConnectivityManager's markSocketAsUser.
Change-Id: Icb9faa5be8c11d10e5c4a3bf95d338319449399c
2013-07-16 15:11:47 -07:00
Jesse Hall
bce7611e8e
Fix build -- update for function signature change
...
Change-Id: I9c2448d5853c69ec7e962847fdaba9a99906cc42
2013-07-16 13:46:20 -07:00
Jesse Hall
3bc3840888
Merge "Rewrite VirtualDisplaySurface"
2013-07-16 20:29:30 +00:00
Jean-Baptiste Queru
384f55fff0
Merge "Tweaks for forward compatibility" into stage-aosp-master
2013-07-16 20:11:18 +00:00
Jean-Baptiste Queru
b6a0ca7276
Tweaks for forward compatibility
...
Change-Id: Id6a96521b3fd5bd2a034fe89cfa4d3a179a66328
2013-07-16 09:38:03 -07:00
Ying Wang
6fda52bc7d
always pass the BufferQueue explicitely to consumers
...
to fix tests build.
Change-Id: I70b9cf5b0d76df709e474181eeb7c42a54ecf43a
2013-07-15 22:20:35 -07:00
Mathias Agopian
7f069d79e7
Merge "always pass the BufferQueue explicitely to consumers"
2013-07-16 02:17:58 +00:00
Jeff Brown
7556c37b1c
Merge "Completely remove skia dependency from libinput."
2013-07-16 01:49:55 +00:00
Jeff Brown
313eff7bb7
Completely remove skia dependency from libinput.
...
Including the tests...
Change-Id: I6ec8f1a5ae7e7514831d7e3b430b3b37b0841b92
2013-07-15 18:49:00 -07:00
michaelwr
174c26045c
Merge "Add a keycode to switch audio tracks (2/2)"
2013-07-16 01:38:36 +00:00
Dianne Hackborn
0fd3bf4652
Merge "Fix issue #9860494 : Waiting for service batteryinfo..."
2013-07-16 01:15:44 +00:00
Jeff Brown
e3468ade9b
Merge "Fix PDK build."
2013-07-16 00:44:20 +00:00
Jeff Brown
5a2f68e5a5
Fix PDK build.
...
Quick hack to remove Skia dependency from libinput.
Change-Id: Ibaf2e312236f5e3f7251fa903ce381456a77467c
2013-07-15 17:31:13 -07:00
Jeff Sharkey
f8bca79df3
Merge "Change legacy "persona" references to userid_t."
2013-07-16 00:19:19 +00:00
Jeff Brown
40c9e0a398
Add skeleton of input flinger.
...
Change-Id: I7f25080e446d4d3d9de9b18fe432a09bc751e0d9
2013-07-15 16:03:14 -07:00
Dianne Hackborn
ee83397bb0
Fix issue #9860494 : Waiting for service batteryinfo...
...
I changed the name of the service, this needs to follow.
Change-Id: Id8e346cee9d75cfe142cd43f6aea43302878b6dc
2013-07-15 15:20:11 -07:00
Jeff Sharkey
abe4fe5b46
Change legacy "persona" references to userid_t.
...
Offers stronger typing with no functional change.
Change-Id: I09f0262470feec5cfdf26658f998c20550af84d4
2013-07-15 15:16:10 -07:00
Jeff Brown
ada11c5e67
Make getCallingUid/Pid const.
...
Change-Id: I1853b21eaa45d85274189dfd72f73fec48d0d6b7
2013-07-15 15:08:39 -07:00
Jesse Hall
38efe86d94
Rewrite VirtualDisplaySurface
...
The previous implementation assumed that the HWC could read and write
the same buffer on frames that involved both GLES and HWC composition.
It turns out some hardware can't do this. The new implementation
maintains a scratch buffer pool to use on these mixed frames, but on
GLES-only or HWC-only frames still does composition directly into the
output buffer.
Bug: 8384764
Change-Id: I7a3addb34fad9bfcbdabbb8b635083e10223df69
2013-07-15 13:59:41 -07:00
Nick Kralevich
b05c4e0f34
Merge "dumpstate: Show SELinux process labels"
2013-07-15 19:36:39 +00:00
Nick Kralevich
76b45c126b
dumpstate: Show SELinux process labels
...
Change-Id: Ie19586a3b733bd4420f6b20b5d253d42c2f165ea
2013-07-15 12:21:40 -07:00
The Android Open Source Project
4ca0c72f2b
am 65752b2b
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '65752b2b516204d890e59dbc395608d7dec0cff5':
2013-07-15 09:37:54 -07:00
The Android Open Source Project
65752b2b51
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: Ia73ebcebfb83a21442a31dc7280763484e47534c
2013-07-15 09:33:20 -07:00
The Android Automerger
70421f3ee3
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-15 08:19:12 -07:00
Mathias Agopian
8f938a5338
always pass the BufferQueue explicitely to consumers
...
Change-Id: I883b0a7b19d8e722f9ab714ba6f49e658b02ca86
2013-07-12 22:06:26 -07:00
Jesse Hall
883140d0bf
Merge "SurfaceFlinger: EventThread: Fix Vsync array size."
2013-07-12 23:31:57 +00:00
Saurabh Shah
5c876fa6b2
SurfaceFlinger: EventThread: Fix Vsync array size.
...
Vsync array size is specified as HWC_DISPLAY_TYPES_SUPPORTED whose
value luckily happens to be 2. That enum is actually used for querying
hwc for the number of displays supported.
The implementation file EventThread.cpp correctly accesses the array
upto HWC_NUM_DISPLAY_TYPES
Change-Id: I36e3f0913e7d6fda7bbf4449c1fb32c7f18bb934
Signed-off-by: Amara Venkata Mastan Manoj Kumar<manojavm@codeaurora.org>
Signed-off-by: Saurabh Shah <saurshah@codeaurora.org>
2013-07-12 16:29:48 -07:00
Mathias Agopian
cdd7d8bc14
resolved conflicts for merge of 00aea5c5
to master
...
Change-Id: Ie1769be863ee2d411eae451907a928db57882e14
2013-07-12 14:19:10 -07:00
Mathias Agopian
00aea5c5ff
am ac9a96da
: fix a dead-lock in sensorservice
...
* commit 'ac9a96da65f6eae4513654adaad8a457d1c1575c':
fix a dead-lock in sensorservice
2013-07-12 13:17:05 -07:00
Dianne Hackborn
1bd5068a51
Fix cmd line arguments for usagestats.
...
Change-Id: I9a1436aa1d1665924ba62a568bb4b66d67ae2814
2013-07-12 12:19:44 -07:00
Mathias Agopian
ac9a96da65
fix a dead-lock in sensorservice
...
sensorservice would deadlock if for some reason
a sensor failed to enable.
simplifed the code a bit, and made it behave a little
closer to mr1.1 -- I couldn't convince myself that
some changes in how locks were used were correct.
Bug: 9794362
Change-Id: I6110f5dbb67e543f1c71d127de2299232badb36a
2013-07-12 02:08:06 -07:00
Jaekyun Seok
8d06dcf9c6
Add a keycode to switch audio tracks (2/2)
...
A key to switch audio tracks is general on media devices like blu-ray.
Bug: 9728155
Change-Id: I13ebbc64321f3cf10370f9a605f3d94ea0d16d6d
2013-07-12 17:23:45 +09:00
Michael Wright
931fd6dee7
Add input device property for buttons under touchpads
...
Bug: 8990644
Change-Id: I6df5fb9e11199173d62523928082db428af55394
2013-07-11 15:24:09 -07:00
The Android Open Source Project
59a99aaad0
am 9201798c
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '9201798cd99d0578fb781aea03635304e49ee3f3':
2013-07-11 10:17:28 -07:00
The Android Open Source Project
ffc791a9de
am 47f31b19
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '47f31b19811a177baa1ae868282374970295caeb':
Find non-extension GLES wrappers in eglGetProcAddress
2013-07-11 10:17:06 -07:00
Elliott Hughes
7b4d5355fb
am 54d97c88
: am 9da67a94
: am 67481607
: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""
...
* commit '54d97c88b57d2c341f0629c9648d4400a34e4f41':
Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
2013-07-11 10:16:47 -07:00
Jesse Hall
4ae03b9975
Merge "resolved conflicts for merge of 5477d0e4
to master"
2013-07-11 17:07:27 +00:00
Jesse Hall
94cdba97ce
resolved conflicts for merge of 5477d0e4
to master
...
Change-Id: I7ca75a44018a68bf3a7ac1de17a3ef568a48d2ac
2013-07-11 09:40:54 -07:00
Andy McFadden
c33f9a76b5
Merge "Pay attention to buffer timestamps"
2013-07-11 14:40:45 +00:00
Mathias Agopian
bb7272f137
Merge "fix SF buffer cropping"
2013-07-10 23:10:58 +00:00
Andy McFadden
1585c4d9fb
Pay attention to buffer timestamps
...
When acquiring a buffer, SurfaceFlinger now computes the expected
presentation time and passes it to the BufferQueue acquireBuffer()
method. If it's not yet time to display the buffer, acquireBuffer()
returns PRESENT_LATER instead of a buffer.
The current implementation of the expected-present-time computation
uses approximations and guesswork.
Bug 7900302
Change-Id: If9345611c5983a11a811935aaf27d6388a5036f1
2013-07-10 15:38:40 -07:00