OSDN Git Service
The Android Open Source Project [Mon, 18 Jul 2011 15:10:06 +0000 (08:10 -0700)]
Reconcile with gingerbread-release
Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
Narayan Kamath [Mon, 18 Jul 2011 09:52:35 +0000 (02:52 -0700)]
Merge "Improve TextToSpeech#isSpeaking()"
Mike Lockwood [Mon, 18 Jul 2011 07:05:24 +0000 (00:05 -0700)]
Merge "MTP: Use a single packet for the data phase"
Svetoslav Ganov [Mon, 18 Jul 2011 06:06:35 +0000 (23:06 -0700)]
Merge "Update the style of the action bar share UI"
Adam Powell [Mon, 18 Jul 2011 00:16:37 +0000 (17:16 -0700)]
Merge "Make View#setBackgroundDrawable a no-op if setting the same background."
Eric Laurent [Mon, 18 Jul 2011 00:12:42 +0000 (17:12 -0700)]
Merge "Audio preprocessing wrapper for webrtc."
Jeff Sharkey [Sun, 17 Jul 2011 23:29:11 +0000 (16:29 -0700)]
Merge "Data usage notifs, newly installed apps, defaults."
Dianne Hackborn [Sun, 17 Jul 2011 21:30:25 +0000 (14:30 -0700)]
Merge "Fix a couple static leaks."
Dianne Hackborn [Sun, 17 Jul 2011 21:29:54 +0000 (14:29 -0700)]
Merge "Rework and fix "adb shell dumpsys meminfo""
Adam Powell [Sun, 17 Jul 2011 21:29:20 +0000 (14:29 -0700)]
Merge "Fix bug
5037642 - Refine back button behavior for action bar modes."
Jeff Sharkey [Sun, 17 Jul 2011 20:06:38 +0000 (13:06 -0700)]
Merge "Acquire wakelock during network stats collection."
Svetoslav Ganov [Sun, 17 Jul 2011 19:26:14 +0000 (12:26 -0700)]
Merge "Throw an exception if accessibility service has not requested to retrieve window content."
Ken Sumrall [Sun, 17 Jul 2011 19:21:00 +0000 (12:21 -0700)]
Merge "During encryption, don't throw exceptions for unknown vold state"
Jeff Sharkey [Sun, 17 Jul 2011 19:06:05 +0000 (12:06 -0700)]
Merge "Release strong Fragment references after exec."
Svetoslav Ganov [Sat, 16 Jul 2011 20:42:11 +0000 (13:42 -0700)]
Merge "Exception in TouchExplorer due to invalid pointer id."
Jeff Brown [Sat, 16 Jul 2011 04:06:09 +0000 (21:06 -0700)]
Merge "Add support for orientationAware touch pads. Bug:
5038388"
Jeff Brown [Sat, 16 Jul 2011 04:05:36 +0000 (21:05 -0700)]
Merge "Remove more edge flag cruft."
Fabrice Di Meglio [Sat, 16 Jul 2011 00:51:46 +0000 (17:51 -0700)]
Merge "Fix bug #
4972141 Overlapping content in single-choice dialogs"
Daniel Lehmann [Sat, 16 Jul 2011 00:41:36 +0000 (17:41 -0700)]
Merge "Use higher resolution in in-call UI if available."
Eric Fischer [Sat, 16 Jul 2011 00:04:36 +0000 (17:04 -0700)]
Merge "Import revised translations."
Fabrice Di Meglio [Fri, 15 Jul 2011 23:52:03 +0000 (16:52 -0700)]
Merge "Some code refactoring"
Romain Guy [Fri, 15 Jul 2011 23:51:30 +0000 (16:51 -0700)]
Merge "Don't break the build..."
Romain Guy [Fri, 15 Jul 2011 23:46:39 +0000 (16:46 -0700)]
Merge "Remove unused code"
Glenn Kasten [Fri, 15 Jul 2011 23:27:13 +0000 (16:27 -0700)]
Merge "Log CPU usage"
Glenn Kasten [Fri, 15 Jul 2011 23:24:26 +0000 (16:24 -0700)]
Merge "CPU statistics library"
Rajneesh Chowdury [Fri, 15 Jul 2011 23:08:01 +0000 (16:08 -0700)]
Merge "Fix for issue
5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF"
John Reck [Fri, 15 Jul 2011 22:58:43 +0000 (15:58 -0700)]
Merge "Implement SeekBarPreference.onGetDefaultValue"
Chet Haase [Fri, 15 Jul 2011 22:29:30 +0000 (15:29 -0700)]
Merge "Fix leak in LayoutTransition"
Chia-chi Yeh [Fri, 15 Jul 2011 22:22:56 +0000 (15:22 -0700)]
Merge "VpnDialogs: change paddings."
Christopher Tate [Fri, 15 Jul 2011 22:05:53 +0000 (15:05 -0700)]
Merge "Support for compressed backups"
Irfan Sheriff [Fri, 15 Jul 2011 21:38:04 +0000 (14:38 -0700)]
Merge "WifiWatchdog rewrite to formal statemachine"
Chet Haase [Fri, 15 Jul 2011 21:32:21 +0000 (14:32 -0700)]
Merge "Read font info from system config files"
Mathias Agopian [Fri, 15 Jul 2011 21:32:10 +0000 (14:32 -0700)]
Merge "dump GLES strings in SF dumpsys log"
Mathias Agopian [Fri, 15 Jul 2011 01:01:49 +0000 (18:01 -0700)]
dump GLES strings in SF dumpsys log
Change-Id: I438d511159b2bd915c84954f30574340017d4f47
Gloria Wang [Fri, 15 Jul 2011 21:20:45 +0000 (14:20 -0700)]
Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
Andreas Huber [Fri, 15 Jul 2011 21:16:15 +0000 (14:16 -0700)]
Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
John Reck [Fri, 15 Jul 2011 20:18:50 +0000 (13:18 -0700)]
Merge "Add a hidden generic property interface"
Jamie Gennis [Fri, 15 Jul 2011 19:35:34 +0000 (12:35 -0700)]
Merge "SurfaceTexture: fix SurfaceTextureGLToGLTest"
Nick Pelly [Fri, 15 Jul 2011 18:20:44 +0000 (11:20 -0700)]
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)
Justin Ho [Fri, 15 Jul 2011 18:13:22 +0000 (11:13 -0700)]
Merge "Updated some effects and notifications"
Robert Greenwalt [Fri, 15 Jul 2011 18:03:52 +0000 (11:03 -0700)]
Gilles Debunne [Fri, 15 Jul 2011 18:03:42 +0000 (11:03 -0700)]
Merge "Removed vertical padding in PreferenceActivity header list on phones"
Robert Greenwalt [Fri, 15 Jul 2011 18:01:36 +0000 (11:01 -0700)]
Merge "resolved conflicts for merge of
8550f3b8 to master"
Alex Sakhartchouk [Fri, 15 Jul 2011 17:57:33 +0000 (10:57 -0700)]
Merge "For the serialization context, no fifo initialization is necessary."
Gilles Debunne [Fri, 15 Jul 2011 17:55:32 +0000 (10:55 -0700)]
Merge "Bug
4382356: No automatic focus change in ScrollViews"
Robert Greenwalt [Fri, 15 Jul 2011 17:52:54 +0000 (10:52 -0700)]
resolved conflicts for merge of
8550f3b8 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
Nick Pelly [Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)]
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)
Robert Greenwalt [Fri, 15 Jul 2011 17:20:48 +0000 (10:20 -0700)]
Fred Quintana [Fri, 15 Jul 2011 17:10:07 +0000 (10:10 -0700)]
Merge "Make the KeyChain handled its own grants rather than having AccountManagerService handle them."
Robert Greenwalt [Fri, 15 Jul 2011 16:55:48 +0000 (09:55 -0700)]
resolved conflicts for merge of
0a46db5d to honeycomb-plus-aosp
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
Fabrice Di Meglio [Fri, 15 Jul 2011 16:49:48 +0000 (09:49 -0700)]
Merge "Implement textDirection heuristic selection."
Gilles Debunne [Fri, 15 Jul 2011 16:41:16 +0000 (09:41 -0700)]
Merge "Bug
5014726: Paste works in ExtractedText"
Glenn Kasten [Fri, 15 Jul 2011 16:23:33 +0000 (09:23 -0700)]
Merge "Bug
5031179 possible fix for assert in join"
Mike Lockwood [Fri, 15 Jul 2011 16:18:34 +0000 (09:18 -0700)]
Merge "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"
Narayan Kamath [Fri, 15 Jul 2011 09:56:31 +0000 (02:56 -0700)]
Merge "Remove the completeAudioAvailable API."
Jeff Brown [Fri, 15 Jul 2011 05:42:15 +0000 (22:42 -0700)]
Merge "Ensure selector state is updated when touch mode changes."
Jeff Brown [Fri, 15 Jul 2011 05:32:09 +0000 (22:32 -0700)]
Merge "Remove edge slop support."
Jeff Brown [Fri, 15 Jul 2011 05:31:40 +0000 (22:31 -0700)]
Merge "Refresh the drawable state when selecting a position."
Jeff Brown [Fri, 15 Jul 2011 05:31:34 +0000 (22:31 -0700)]
Merge "ListView focus bugfix."
Jeff Brown [Fri, 15 Jul 2011 05:31:27 +0000 (22:31 -0700)]
Merge "Add a call to pthread_attr_destroy to avoid potential memory leaks."
Jeff Brown [Fri, 15 Jul 2011 05:31:17 +0000 (22:31 -0700)]
Merge "Frameworks: fixes possible invalid pointer index call."
Jeff Brown [Fri, 15 Jul 2011 04:55:58 +0000 (21:55 -0700)]
Merge "Enter touch mode on ACTION_SCROLL."
Adam Powell [Fri, 15 Jul 2011 04:53:41 +0000 (21:53 -0700)]
Merge "Fix bug
5032301 - size list menu icons appropriately."
Jeff Sharkey [Fri, 15 Jul 2011 04:15:49 +0000 (21:15 -0700)]
Merge "Hide NetworkTemplate details, buffered stats I/O."
Mathias Agopian [Fri, 15 Jul 2011 03:21:59 +0000 (20:21 -0700)]
Merge "fix a typo in ISurfaceTexture IPC code"
Mathias Agopian [Fri, 15 Jul 2011 03:20:58 +0000 (20:20 -0700)]
fix a typo in ISurfaceTexture IPC code
Change-Id: Ied1d9ddb0d849b17219d0ea3d333ce12be849419
Le-Chun Wu [Thu, 14 Jul 2011 21:27:18 +0000 (14:27 -0700)]
Add a call to pthread_attr_destroy to avoid potential memory leaks.
Change-Id: Ib57efc3530e9793298190cc9cab19c9af54e11a7
Chia-chi Yeh [Fri, 15 Jul 2011 02:05:33 +0000 (19:05 -0700)]
Merge "VPN: tear down VPN when the dependent interface is down."
Adam Powell [Fri, 15 Jul 2011 01:58:28 +0000 (18:58 -0700)]
Merge "Smooth the spinners"
Adam Powell [Fri, 15 Jul 2011 01:52:26 +0000 (18:52 -0700)]
Merge "Fix regression with legacy expanded menus"
Mathias Agopian [Fri, 15 Jul 2011 01:04:09 +0000 (18:04 -0700)]
Merge "sensorservice: be more robust when there are no sensor h/w"
Jamie Gennis [Fri, 15 Jul 2011 00:54:27 +0000 (17:54 -0700)]
Merge changes Id9aa1003,I8c154189
* changes:
SurfaceTexture: make (dis)connect into an IPC
SurfaceTexture: add support for new connect values
Jamie Gennis [Thu, 14 Jul 2011 02:12:20 +0000 (19:12 -0700)]
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
Dianne Hackborn [Fri, 15 Jul 2011 00:23:28 +0000 (17:23 -0700)]
Merge "Move LoadAverageService to the SystemUI apk."
Jamie Gennis [Fri, 15 Jul 2011 00:11:47 +0000 (17:11 -0700)]
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
Jeff Brown [Fri, 15 Jul 2011 00:08:16 +0000 (17:08 -0700)]
Merge "Minor code cleanups in vector."
Jeff Brown [Thu, 14 Jul 2011 23:52:10 +0000 (16:52 -0700)]
Merge "Replace Vector _grow/_shrink checks with assert."
James Dong [Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)]
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
Chia-chi Yeh [Thu, 14 Jul 2011 23:22:21 +0000 (16:22 -0700)]
Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors."
Adam Cohen [Thu, 14 Jul 2011 22:55:55 +0000 (15:55 -0700)]
Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter"
Jim Miller [Thu, 14 Jul 2011 22:43:17 +0000 (15:43 -0700)]
Merge "Fix
5027468: prevent screen from turning back on while lockscreen in password mode."
Fabrice Di Meglio [Thu, 14 Jul 2011 22:31:03 +0000 (15:31 -0700)]
Merge "Fix bug #
5025936 TableLayout layout direction resolution is broken"
Chia-chi Yeh [Thu, 14 Jul 2011 22:22:59 +0000 (15:22 -0700)]
Merge "VPN: Hook up the new control protocol and network state."
Jamie Gennis [Wed, 13 Jul 2011 19:57:23 +0000 (12:57 -0700)]
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
Justin Ho [Thu, 14 Jul 2011 21:54:01 +0000 (14:54 -0700)]
Merge "Initial pass at some preload drawables Bug:
5020126"
Chia-chi Yeh [Thu, 14 Jul 2011 21:53:58 +0000 (14:53 -0700)]
Merge "ip-up-vpn: Create proper states for pppd and racoon."
John Wang [Thu, 14 Jul 2011 21:03:11 +0000 (14:03 -0700)]
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.
John Wang [Thu, 14 Jul 2011 21:00:58 +0000 (14:00 -0700)]
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.
John Wang [Thu, 14 Jul 2011 20:59:10 +0000 (13:59 -0700)]
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
Eino-Ville Talvala [Thu, 14 Jul 2011 20:38:55 +0000 (13:38 -0700)]
Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera."
Elliott Hughes [Thu, 14 Jul 2011 20:28:00 +0000 (13:28 -0700)]
Merge "Fix aidl to cope with multiple collection types per method."
Andreas Huber [Thu, 14 Jul 2011 20:22:45 +0000 (13:22 -0700)]
Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
Romain Guy [Thu, 14 Jul 2011 19:45:23 +0000 (12:45 -0700)]
Merge "Force bitmaps to load in ARGB8888 by default. Bug #
5024993"
Philip Milne [Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)]
Merge "Rationalize API after adding maximum size feature."
Narayan Kamath [Thu, 14 Jul 2011 18:13:07 +0000 (11:13 -0700)]
Merge "Minor documentation updates for the AudioTrack class."
Glenn Kasten [Thu, 14 Jul 2011 17:59:40 +0000 (10:59 -0700)]
Merge "Add MEDIA_UID"
Wink Saville [Thu, 14 Jul 2011 17:55:58 +0000 (10:55 -0700)]
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.
Jaikumar Ganesh [Thu, 14 Jul 2011 17:55:55 +0000 (10:55 -0700)]
am
6dd45316: (-s ours) resolved conflicts for merge of
ab3ec176 to honeycomb-plus-aosp
* commit '
6dd4531639157191e6224d3f8af5c9d099ca945f':
Bluetooth: correcting return value from cancelDiscovery
John Wang [Thu, 14 Jul 2011 17:49:38 +0000 (10:49 -0700)]
am
28d92afc: am
2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '
28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
Add getImei() to Phone interface.
Dianne Hackborn [Thu, 14 Jul 2011 17:48:01 +0000 (10:48 -0700)]
Merge "Improve handling of low memory."