Jamie Gennis
0b7c4953a1
Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"
2011-07-15 12:35:34 -07:00
Nick Pelly
96f1959dfe
am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
...
* commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
2011-07-15 11:20:44 -07:00
Justin Ho
bbc21229d7
Merge "Updated some effects and notifications"
2011-07-15 11:13:22 -07:00
Robert Greenwalt
3265b5178a
am e1635197: am 476f5525: Small fix to 5008973 fix.
...
* commit 'e1635197bb6e6471b333d194855bb399da419957':
Small fix to 5008973 fix.
2011-07-15 11:03:52 -07:00
Gilles Debunne
9cda0ece58
Merge "Removed vertical padding in PreferenceActivity header list on phones"
2011-07-15 11:03:42 -07:00
Robert Greenwalt
9c091f3d38
Merge "resolved conflicts for merge of 8550f3b8 to master"
2011-07-15 11:01:36 -07:00
Alex Sakhartchouk
af3d927e71
Merge "For the serialization context, no fifo initialization is necessary."
2011-07-15 10:57:33 -07:00
Gilles Debunne
c20cbc32f0
Merge "Bug 4382356: No automatic focus change in ScrollViews"
2011-07-15 10:55:32 -07:00
Robert Greenwalt
db36dafd72
resolved conflicts for merge of 8550f3b8 to master
...
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
2011-07-15 10:52:54 -07:00
Nick Pelly
5b9b4ebf78
am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
...
* commit '1bce9e25b6979780d849096059ef73507bdda250':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
2011-07-15 10:47:10 -07:00
Robert Greenwalt
5812538e90
am 476f5525: Small fix to 5008973 fix.
...
* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
Small fix to 5008973 fix.
2011-07-15 10:20:48 -07:00
Fred Quintana
a94090a783
Merge "Make the KeyChain handled its own grants rather than having AccountManagerService handle them."
2011-07-15 10:10:07 -07:00
Robert Greenwalt
b4bd2daedd
resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp
...
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
2011-07-15 09:55:48 -07:00
Fabrice Di Meglio
9d21bedaa5
Merge "Implement textDirection heuristic selection."
2011-07-15 09:49:48 -07:00
Gilles Debunne
84f8b09038
Merge "Bug 5014726: Paste works in ExtractedText"
2011-07-15 09:41:16 -07:00
Glenn Kasten
f24e645976
Merge "Bug 5031179 possible fix for assert in join"
2011-07-15 09:23:33 -07:00
Mike Lockwood
6f81c402d5
Merge "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"
2011-07-15 09:18:34 -07:00
Narayan Kamath
f26bfd9f2e
Merge "Remove the completeAudioAvailable API."
2011-07-15 02:56:31 -07:00
Jeff Brown
922e36d70d
Merge "Ensure selector state is updated when touch mode changes."
2011-07-14 22:42:15 -07:00
Jeff Brown
ab58754664
Merge "Remove edge slop support."
2011-07-14 22:32:09 -07:00
Jeff Brown
6f2d1f3ee4
Merge "Refresh the drawable state when selecting a position."
2011-07-14 22:31:40 -07:00
Jeff Brown
fd9714b3b2
Merge "ListView focus bugfix."
2011-07-14 22:31:34 -07:00
Jeff Brown
ce071667d0
Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."
2011-07-14 22:31:27 -07:00
Jeff Brown
209646dfe7
Merge "Frameworks: fixes possible invalid pointer index call."
2011-07-14 22:31:17 -07:00
Jeff Brown
e32c58acc9
Merge "Enter touch mode on ACTION_SCROLL."
2011-07-14 21:55:58 -07:00
Adam Powell
fec3b1e8e3
Merge "Fix bug 5032301 - size list menu icons appropriately."
2011-07-14 21:53:41 -07:00
Jeff Sharkey
cfb2b120ce
Merge "Hide NetworkTemplate details, buffered stats I/O."
2011-07-14 21:15:49 -07:00
Mathias Agopian
dcb68b777a
Merge "fix a typo in ISurfaceTexture IPC code"
2011-07-14 20:21:59 -07:00
Mathias Agopian
2773004a83
fix a typo in ISurfaceTexture IPC code
...
Change-Id: Ied1d9ddb0d849b17219d0ea3d333ce12be849419
2011-07-14 20:20:58 -07:00
Le-Chun Wu
3919950de8
Add a call to pthread_attr_destroy to avoid potential memory leaks.
...
Change-Id: Ib57efc3530e9793298190cc9cab19c9af54e11a7
2011-07-14 20:14:07 -07:00
Chia-chi Yeh
e52dcef5cb
Merge "VPN: tear down VPN when the dependent interface is down."
2011-07-14 19:05:33 -07:00
Adam Powell
f933c8dd79
Merge "Smooth the spinners"
2011-07-14 18:58:28 -07:00
Adam Powell
48b349eb55
Merge "Fix regression with legacy expanded menus"
2011-07-14 18:52:26 -07:00
Mathias Agopian
f4f7fe258b
Merge "sensorservice: be more robust when there are no sensor h/w"
2011-07-14 18:04:09 -07:00
Jamie Gennis
677517ae3f
Merge changes Id9aa1003,I8c154189
...
* changes:
SurfaceTexture: make (dis)connect into an IPC
SurfaceTexture: add support for new connect values
2011-07-14 17:54:27 -07:00
Jamie Gennis
fe0a87b546
SurfaceTexture: make (dis)connect into an IPC
...
This change makes the ANativeWindow connect and disconnect calls result
in an IPC to the SurfaceTexture object. This will allow us to prevent
multiple simultaneous connections from different processes.
Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
2011-07-14 17:48:32 -07:00
Dianne Hackborn
f8196862fd
Merge "Move LoadAverageService to the SystemUI apk."
2011-07-14 17:23:28 -07:00
Jamie Gennis
2640bfd168
SurfaceTexture: fix SurfaceTextureGLToGLTest
...
This change fixes a couple different issues in the
SurfaceTextureGLToGLTest test fixture:
- incorrect use of conditions
- move logging after the locks are acquired
- call the parent class's TearDown method
- clean up the SurfaceTexture before eglTerminate gets called
Change-Id: I6960e5ab7f144225f01a2089d3f849c99fed0b38
2011-07-14 17:11:47 -07:00
Jeff Brown
c9367a80d1
Merge "Minor code cleanups in vector."
2011-07-14 17:08:16 -07:00
Jeff Brown
eb629fc78d
Merge "Replace Vector _grow/_shrink checks with assert."
2011-07-14 16:52:10 -07:00
James Dong
a2fd1773ba
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
2011-07-14 16:42:34 -07:00
Chia-chi Yeh
e99545ed6b
Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors."
2011-07-14 16:22:21 -07:00
Adam Cohen
c3104e31ff
Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter"
2011-07-14 15:55:55 -07:00
Jim Miller
57dfc671dd
Merge "Fix 5027468: prevent screen from turning back on while lockscreen in password mode."
2011-07-14 15:43:17 -07:00
Fabrice Di Meglio
407b10b2a6
Merge "Fix bug #5025936 TableLayout layout direction resolution is broken"
2011-07-14 15:31:03 -07:00
Chia-chi Yeh
3fb46e476b
Merge "VPN: Hook up the new control protocol and network state."
2011-07-14 15:22:59 -07:00
Jamie Gennis
3e646d62e5
SurfaceTexture: add support for new connect values
...
This change adds support to SurfaceTextureClient for the new enum values
that can be passed to the ANativeWindow connect call.
Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
2011-07-14 15:03:33 -07:00
Justin Ho
5ad8677bfb
Merge "Initial pass at some preload drawables Bug: 5020126"
2011-07-14 14:54:01 -07:00
Chia-chi Yeh
cc9b3691f2
Merge "ip-up-vpn: Create proper states for pppd and racoon."
2011-07-14 14:53:58 -07:00
John Wang
11dc831372
am 74c425d3: am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
...
* commit '74c425d3e95ed0f47b1a5d447007886d01d7ff56':
Show SIM blocked after 10 time puk wrong entries.
2011-07-14 14:03:11 -07:00