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
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
John Wang
76652989ac
am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
...
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
Show SIM blocked after 10 time puk wrong entries.
2011-07-14 14:00:58 -07:00
John Wang
1acde887d5
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
2011-07-14 13:59:10 -07:00
Eino-Ville Talvala
c958b87606
Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera."
2011-07-14 13:38:55 -07:00
Elliott Hughes
bc612a0254
Merge "Fix aidl to cope with multiple collection types per method."
2011-07-14 13:28:00 -07:00
Andreas Huber
c8105b1941
Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
2011-07-14 13:22:45 -07:00
Romain Guy
3f5f248676
Merge "Force bitmaps to load in ARGB8888 by default. Bug #5024993 "
2011-07-14 12:45:23 -07:00
Philip Milne
2989e23704
Merge "Rationalize API after adding maximum size feature."
2011-07-14 11:32:09 -07:00
Narayan Kamath
2ac5e40251
Merge "Minor documentation updates for the AudioTrack class."
2011-07-14 11:13:07 -07:00
Glenn Kasten
92c5663426
Merge "Add MEDIA_UID"
2011-07-14 10:59:40 -07:00
Wink Saville
8f06479025
am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
...
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-14 10:55:58 -07:00
Jaikumar Ganesh
1ecf9d3e28
am 6dd45316: (-s ours) resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp
...
* commit '6dd4531639157191e6224d3f8af5c9d099ca945f':
Bluetooth: correcting return value from cancelDiscovery
2011-07-14 10:55:55 -07:00
John Wang
b62a5356ff
am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
...
* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
Add getImei() to Phone interface.
2011-07-14 10:49:38 -07:00
Dianne Hackborn
93efe80b13
Merge "Improve handling of low memory."
2011-07-14 10:48:01 -07:00
Jaikumar Ganesh
21ac6a6842
Merge "Remove Car audio class from auto pairing."
2011-07-14 10:08:41 -07:00