Jamie Gennis
6e50219aee
SurfaceTexture: add a deadlock scenario test
...
This change adds a test to ensure that a GL driver that's blocking on a
call to dequeueBuffer does not block other GL threads from rendering and
queueing buffers.
Change-Id: Ifdd234effc534b6a9cf8522ca87f64da5bb0bbd6
2011-07-22 14:03:31 -07:00
Jamie Gennis
1259e9d6ac
Merge changes I799532f7,I5cffa6eb
...
* changes:
SurfaceTexture: fix a comment
SurfaceTexture: remove getAllocator
2011-07-22 13:34:57 -07:00
Robert Greenwalt
cf85bad105
am 19933916: am ad55d351: Add better routes for secondary DNS
...
* commit '199339169476d0d6d0ecaa8ed3bff3a9e9a0f430':
Add better routes for secondary DNS
2011-07-22 13:17:54 -07:00
Robert Greenwalt
7e00745cca
am ad55d351: Add better routes for secondary DNS
...
* commit 'ad55d35114237071133eb28ded93a014185d4e35':
Add better routes for secondary DNS
2011-07-22 13:15:56 -07:00
Adam Cohen
e4d28f5b91
Merge "Fixing new minResizeWidth/Height API"
2011-07-22 12:27:37 -07:00
Pannag Sanketi
87883194db
Merge "Renaming SurfaceEncoder to SurfaceMediaSource"
2011-07-22 11:49:36 -07:00
Pannag Sanketi
49b529808a
Merge "Adding SurfaceEncoder for encoding FilterFrames"
2011-07-22 11:49:21 -07:00
Irfan Sheriff
0db4619a4a
Merge "Fixing WifiWatchdog log flag"
2011-07-22 11:20:14 -07:00
Dianne Hackborn
1f16968db1
Merge "Fix issue #5054723 : java.lang.NullPointerException at..."
2011-07-22 11:07:22 -07:00
Eric Laurent
e4ed56b203
Merge "Fix issue 4988574: 8 bit PCM audio playback broken."
2011-07-22 11:04:07 -07:00
Dianne Hackborn
99ba1668d2
Merge "Fix issue #5050039 : Launcher is sometimes rendering..."
2011-07-22 10:52:34 -07:00
Daniel Sandler
4ab977935a
Merge "Disable the number bubble overlay on notification icons."
2011-07-22 10:34:13 -07:00
Andreas Huber
9cbc12818b
Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)."
2011-07-22 10:25:24 -07:00
Jesse Wilson
2993e16cf0
Merge "Fix benign off-by-one in JsonReader."
2011-07-22 10:21:30 -07:00
James Dong
25b4d2e5c5
Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."
2011-07-22 10:09:22 -07:00
Alex Sakhartchouk
fea1f4f628
Merge "Fixing bitmap invalidation bug."
2011-07-22 09:52:27 -07:00
Gilles Debunne
38f2b21e04
Merge "Minor dash typos in documentation"
2011-07-22 09:24:31 -07:00
Daisuke Miyakawa
85ed05e518
Merge "Introduce hidden API Contacts.CONTENT_FREQUENT_URI"
2011-07-22 08:05:55 -07:00
satok
478d17dcce
Merge "Delay load the settings for the ongoing ime swither"
2011-07-22 04:11:49 -07:00
satok
9625180bbf
Merge "Create TextServiceManager and SpellCheckerService"
2011-07-21 22:59:48 -07:00
Dianne Hackborn
2b2a924b21
Merge "Fix issue #5061083 : Handler.removeCallbacksAndMessages..."
2011-07-21 21:53:19 -07:00
Mathias Agopian
72a66081f4
Merge "Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT"
2011-07-21 20:34:47 -07:00
Michael Jurka
55b5ea4d7b
Merge "Prevent notification swipes from getting canceled too soon."
2011-07-21 19:57:54 -07:00
Adam Powell
9a23342738
Merge "Fix bug 5037537 - Revert "ListView focus bugfix.""
2011-07-21 19:33:26 -07:00
Daniel Sandler
ce5eed3df5
Merge "Subtract the navbar's bounds from fullscreen windows."
2011-07-21 19:05:35 -07:00
Dianne Hackborn
e05a2aca37
Merge "Move status bar above keyguard."
2011-07-21 18:51:45 -07:00
JP Abgrall
db39021a7a
Merge "NetworkManagementService: receive bandwidth controller events"
2011-07-21 18:44:52 -07:00
Adam Powell
e9748cc4a5
Merge "Bug 5061529 - Save/restore action view state for menu items across invalidations."
2011-07-21 18:22:02 -07:00
Kazuhiro Ondo
c390c5ba82
am b7ad442c: am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
...
* commit 'b7ad442c90146f736c6268c21e34a87fbcab6335':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:19:21 -07:00
Kazuhiro Ondo
8123f3669c
am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
...
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:15:26 -07:00
Pannag Sanketi
800f40be50
Merge "Adding AndoirdOpaque Colorformat to OMX"
2011-07-21 18:11:00 -07:00
Romain Guy
9a9f86dc3d
Merge "Ouput looper traces as traceview traces"
2011-07-21 18:07:16 -07:00
Dianne Hackborn
ec3763d4a0
Merge "Fix issue #5021385 : Title of any Settings subscreen changes..."
2011-07-21 17:53:51 -07:00
Jeff Brown
ba615bb226
Merge "Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList. Bug: 5062011"
2011-07-21 17:44:08 -07:00
Chia-chi Yeh
f28fa78f3d
Merge "VPN: add VpnBuilder as the public API of user space VPN."
2011-07-21 17:37:11 -07:00
Adam Powell
6fc888748c
Merge "Fix bug 5048482 - mischievous monkeys editing text in IME extract mode"
2011-07-21 17:33:00 -07:00
Michael Jurka
77ee42e4d3
Merge "Fix crash in recents"
2011-07-21 17:13:13 -07:00
Pannag Sanketi
acb7b5dfc8
Adding SurfaceEncoder for encoding FilterFrames
...
Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.
SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.
Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.
The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.
Related to bug id: 4529323
Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
2011-07-21 17:12:50 -07:00
John Wang
3b4768a318
Merge "Remove APN type in notifyDataConnection."
2011-07-21 17:06:08 -07:00
Jaikumar Ganesh
ae6092f5b4
Merge "Auto Pairing tweaks."
2011-07-21 16:27:55 -07:00
Mike Lockwood
a272071020
Merge "UsbDeviceManager: Add USB notification string for USB accessory mode"
2011-07-21 16:24:27 -07:00
Mike Lockwood
f13ffabe25
Merge "USB: Fix handling USB accessory attached when device is booting"
2011-07-21 16:24:18 -07:00
John Reck
5d40714481
Merge "Fixup handling destroy"
2011-07-21 16:21:13 -07:00
Dianne Hackborn
7cd8f154d3
Merge "Fix bug where memory trim was not being delivered with correct level."
2011-07-21 16:19:11 -07:00
Fabrice Di Meglio
054112fec7
Merge "Fix CheckTextView padding"
2011-07-21 16:12:43 -07:00
Chris Craik
a400e601ef
Merge "New log format, Manual log generation, plus logging of invalidates"
2011-07-21 15:59:17 -07:00
Jeff Hamilton
b6cd66ba90
Merge "Make READ_FRAME_BUFFER signatureOrSystem."
2011-07-21 15:57:41 -07:00
Romain Guy
fb371f0b8c
Merge "Add looper profiling to adb shell am"
2011-07-21 15:31:59 -07:00
Mathias Agopian
bb66c9b5a9
Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT
...
- fixed uninitialized variable
- set hint to indentity when transform is too complex
- make sure FrameBufferNativeWindow doesn't fail on needed perform commands
Bug: 4487161
Change-Id: I7cb2b0869b72404732eca7cb2d145ff669e2ed9b
2011-07-21 14:50:29 -07:00
Jamie Gennis
29c870271e
SurfaceTexture: fix a comment
...
Change-Id: I799532f77f8fbb6b8ee6888fdd8852b6f28e8c33
2011-07-21 14:32:56 -07:00