Jamie Gennis
fa1e002cec
Merge "SurfaceTexture: enable RGB external textures"
2011-07-25 11:46:51 -07:00
Svetoslav Ganov
d8d737a6d2
Merge "Switch state text not added to accessibility events."
2011-07-25 11:23:56 -07:00
Matthew Xie
0b91030f19
Merge "Keep Bluetooth module hot to quickly swith it on/off"
2011-07-25 11:14:25 -07:00
Jean-Michel Trivi
3c713b5790
Merge "Fix bug 4211099 channel constants and 7.1 mask"
2011-07-25 11:07:16 -07:00
Adam Powell
e2f884fc5f
Merge "Fix bug 5060033 - No text-editing toolbar when in a dialog"
2011-07-25 10:57:42 -07:00
Ted Bonkenburg
8d14330bd7
Merge "Add support for creating a Surface from a a SurfaceTexture."
2011-07-25 10:24:30 -07:00
Ben Murdoch
393211b357
Merge "Add a System.Secure setting for the Autofill server URL."
2011-07-25 09:41:46 -07:00
Ben Murdoch
54bab1ee19
Merge "Fix for Autofill calling WebView.getSettings on background thread."
2011-07-25 09:34:21 -07:00
Flavio Lerda
b41b5b0544
Merge "Add IS_READ column in call log and voicemail providers."
2011-07-25 07:44:02 -07:00
satok
acd815e4a0
Merge "[Step 2] Add apis for spell checker settings"
2011-07-24 18:47:50 -07:00
Daisuke Miyakawa
3ebac2064b
Merge "Introduce param/column for group count"
2011-07-24 17:53:47 -07:00
Irfan Sheriff
e8fdc9ca64
Merge "Fix interface notification race"
2011-07-24 17:14:12 -07:00
James Dong
355240e6db
Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
2011-07-24 14:40:08 -07:00
Jean-Michel Trivi
19a4a8e655
Merge "QueryCodecs() signature change"
2011-07-24 12:59:35 -07:00
repo sync
ecaa55439f
Merge "Updated: Wi-Fi p2p framework"
2011-07-24 12:57:17 -07:00
Gloria Wang
b194faba9a
Merge "Do not change the number of bytes while converting 8-bit samples to 16-bit, because this number will be used later to calculate mCurrentPos. Fix for bug 5063703."
2011-07-24 12:07:20 -07:00
Wink Saville
35f8df580c
am 051660d4: am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
...
* commit '051660d4d6d293f4b561bc6a772c70aa077a578a':
Configure RAT dependent retry pattern in GSM DCT.
2011-07-24 09:15:39 -07:00
Kazuhiro Ondo
6291e6d4ee
am 9820a9d2: am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
...
* commit '9820a9d299dc46f2a9037866ddf61c4782cf9186':
Allow suggestedRetryTime to indicate no retry is needed.
2011-07-24 09:13:52 -07:00
Wink Saville
c2263c2148
am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
...
* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
Configure RAT dependent retry pattern in GSM DCT.
2011-07-24 09:13:26 -07:00
Kazuhiro Ondo
743c693bde
am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.
...
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
2011-07-24 09:11:42 -07:00
Wink Saville
0785a79c4e
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
2011-07-24 09:11:28 -07:00
Irfan Sheriff
d563a796b4
Merge "Handle hostapd and tether interface changes"
2011-07-23 22:30:36 -07:00
Svetoslav Ganov
919f947074
Merge "TwoStatePreference does not fire click events."
2011-07-23 19:38:47 -07:00
Mike Lockwood
c3b902979e
Merge "Fix USB tethering"
2011-07-23 19:36:32 -07:00
satok
c9d09ffd50
Merge "Tweak APIs for SpellChecker"
2011-07-22 23:17:51 -07:00
satok
f9eeb59542
Merge "Display the current ime and subtype name in the ongoing notification"
2011-07-22 20:14:27 -07:00
Fabrice Di Meglio
ee4d7185e9
Merge "Code cleaning"
2011-07-22 19:24:52 -07:00
James Dong
4d027bacc6
Merge "Deprecate two methods in MediaRecorder.java class"
2011-07-22 17:59:10 -07:00
Chia-chi Yeh
da4d4b1629
Merge "VPN: increase timeout period to 60 seconds for legacy VPN."
2011-07-22 17:14:50 -07:00
Svetoslav Ganov
bbcd5930c5
am 3e930dba: (-s ours) am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
...
* commit '3e930dba58442776b3c921b3dc1980fdba2caed9':
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
2011-07-22 17:10:32 -07:00
Svetoslav Ganov
f31250adb3
am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
...
* commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f':
DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
2011-07-22 17:07:28 -07:00
Svetoslav Ganov
c050ec4512
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
2011-07-22 17:05:26 -07:00
Romain Guy
164b7a466f
Merge "Fix the build"
2011-07-22 16:46:59 -07:00
Pannag Sanketi
bf2f51e59c
Merge "Connect MediaRecorder Native to SurfaceMediaSource"
2011-07-22 16:42:41 -07:00
Ted Bonkenburg
bd050ab2af
Add support for creating a Surface from a a SurfaceTexture.
...
The Surface is already using SurfaceTexture internally and it is parcelable. This
is intended to replace and phase out ParcelSurfaceTexture in favor of creating a
new Surface.java object from an existing SurfaceTexture.
Change-Id: I8e2dd86614523da6abed6403e1d705a68fa19fdf
2011-07-22 16:36:44 -07:00
Jamie Gennis
6a0dedfcaf
Merge changes Ibd261f7b,Ifdd234ef,I0e2f0bc3
...
* changes:
SurfaceTexture: add the abandon method.
SurfaceTexture: add a deadlock scenario test
SurfaceMediaSource: remove getAllocator method
2011-07-22 16:24:03 -07:00
Romain Guy
037f347dc2
Merge "Nested alpha animations should cause invalidates too Bug #5041061 "
2011-07-22 16:04:00 -07:00
Jamie Gennis
1f8e09f40d
SurfaceTexture: enable RGB external textures
...
This change removes support for conditionally using the GL_TEXTURE_2D
target for SurfaceTexture textures with RGB buffers. It also enables
and fixes the RGB-based SurfaceTexture tests.
Change-Id: I9a251a981cf66af6b048b2e4c3fe7231e4774f4d
2011-07-22 15:45:18 -07:00
Mathias Agopian
1679e909eb
Merge "Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT"
2011-07-22 15:27:47 -07:00
Mathias Agopian
6dc49c09bc
Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT
...
Bug: 4487161
Change-Id: Ib2dfbbef15397b6d90695bd27f25849ca20704f1
2011-07-22 15:25:20 -07:00
Adam Powell
a479fc5c98
Merge "Fix bug 5027071 - Action menu parent consistency"
2011-07-22 14:28:39 -07:00
Jamie Gennis
7b305fffc3
SurfaceTexture: add the abandon method.
...
This change adds the 'abandon' method to the SurfaceTexture C++ class.
This method may be used to put the SurfaceTexture in an abandoned state,
causing all ISurfaceTexture methods to fail.
Change-Id: Ibd261f7b73f44e2bec36a8508bf92113cfb7cf95
2011-07-22 14:20:41 -07:00
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