OSDN Git Service
Dianne Hackborn [Tue, 26 Jul 2011 00:25:09 +0000 (17:25 -0700)]
am
1b20abd3: am
20bf46af: am
b0878223: am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
1b20abd30c2757132b7a2d319ae73f420b864ed4':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Tue, 26 Jul 2011 00:25:00 +0000 (17:25 -0700)]
am
6d21aee8: am
9ce1ecdf: am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
6d21aee882215e8a17408f6ae1fbfba5cf8e440f':
frameworks/base: unlink death notifications of Vibrate requests
Xavier Ducrohet [Tue, 26 Jul 2011 00:24:56 +0000 (17:24 -0700)]
am
ed07215e: am
55775e5f: am
e70b2b8f: am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
ed07215e482cae1ffedbba707284821b3afc310f':
Layoutlib_create flag -p: don't change all accesses to public.
Kenny Root [Tue, 26 Jul 2011 00:24:52 +0000 (17:24 -0700)]
am
64ed1059: am
e612c881: am
4f3a8db6: am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
64ed105957098a900d58e7c2598e060cb37755ce':
Continue idmap generation even if name lookup fails.
Winson Chung [Tue, 26 Jul 2011 00:20:19 +0000 (17:20 -0700)]
Merge "Using the filename as the media title for screenshots and changing filename format."
Robert Greenwalt [Tue, 26 Jul 2011 00:12:22 +0000 (17:12 -0700)]
Merge "resolved conflicts for merge of
a7f68230 to master"
Romain Guy [Mon, 25 Jul 2011 23:38:13 +0000 (16:38 -0700)]
Merge "Improve rendering performance on some GPUs"
Gloria Wang [Mon, 25 Jul 2011 23:36:20 +0000 (16:36 -0700)]
Merge "Fix for bug
4371230. - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client"
Robert Greenwalt [Mon, 25 Jul 2011 23:06:25 +0000 (16:06 -0700)]
resolved conflicts for merge of
a7f68230 to master
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9
Svetoslav Ganov [Mon, 25 Jul 2011 23:03:23 +0000 (16:03 -0700)]
Merge "Set initial bounds offset to (0,0) so that in-screen bounds reported by AccessibilityNodeInfo are correct"
Pannag Sanketi [Mon, 25 Jul 2011 22:00:16 +0000 (15:00 -0700)]
Merge "Adding Metadata mode to SurfaceMediaSource"
Jason Sams [Mon, 25 Jul 2011 21:54:49 +0000 (14:54 -0700)]
Merge "Add size param to rsForEach bug
5074640"
Romain Guy [Mon, 25 Jul 2011 21:44:05 +0000 (14:44 -0700)]
Merge "Add debug flag to print out the EGL configuration used by libhwui"
Romain Guy [Mon, 25 Jul 2011 21:43:56 +0000 (14:43 -0700)]
Merge "Add ELG config debugging to HardwareRenderer"
Eric Laurent [Mon, 25 Jul 2011 21:43:05 +0000 (14:43 -0700)]
Merge "Added APIs for audio preprocessing"
James Dong [Mon, 25 Jul 2011 21:21:14 +0000 (14:21 -0700)]
Merge "Do not support still image capture mode for timelapse video recording"
Adam Cohen [Mon, 25 Jul 2011 20:54:02 +0000 (13:54 -0700)]
Merge "Fixing old bug with AdapterViewFlipper"
Philip Milne [Mon, 25 Jul 2011 20:43:09 +0000 (13:43 -0700)]
Merge "Fix for http://b/issue?id=
5064532"
Michael Jurka [Mon, 25 Jul 2011 20:38:48 +0000 (13:38 -0700)]
Merge "Unifying swipe behavior for Recents and Notifications"
Kenny Root [Mon, 25 Jul 2011 19:32:10 +0000 (12:32 -0700)]
Merge "Change user 0 directory back for compatibility"
Kenny Root [Mon, 25 Jul 2011 19:32:01 +0000 (12:32 -0700)]
Merge "Stop using charAt for Signatures"
Dianne Hackborn [Mon, 25 Jul 2011 19:21:32 +0000 (12:21 -0700)]
am
20bf46af: am
b0878223: am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
20bf46af14130314ae1aeb1e5482c38556c8f0f8':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Mon, 25 Jul 2011 19:21:29 +0000 (12:21 -0700)]
am
9ce1ecdf: am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
9ce1ecdfde98c7b5b5ec346b883df0a50d9722e1':
frameworks/base: unlink death notifications of Vibrate requests
Xavier Ducrohet [Mon, 25 Jul 2011 19:21:17 +0000 (12:21 -0700)]
am
55775e5f: am
e70b2b8f: am
9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '
55775e5f34af8d7c22ab3212c253b3a7d34a6f8a':
Layoutlib_create flag -p: don't change all accesses to public.
Kenny Root [Mon, 25 Jul 2011 19:21:06 +0000 (12:21 -0700)]
am
e612c881: am
4f3a8db6: am
3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '
e612c881ecf74770098aa9c07d4f0611ac982038':
Continue idmap generation even if name lookup fails.
Eric Laurent [Mon, 25 Jul 2011 19:20:23 +0000 (12:20 -0700)]
Merge "AudioFlinger: add dump of audio pre processing."
Svetoslav Ganov [Mon, 25 Jul 2011 19:10:46 +0000 (12:10 -0700)]
Merge "TouchExplorer long press not working and activation tap not respecting distance slop."
Robert Greenwalt [Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)]
resolved conflicts for merge of
26ecc31f to honeycomb-plus-aosp
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
Svetoslav Ganov [Mon, 25 Jul 2011 19:08:08 +0000 (12:08 -0700)]
Merge "Touch exploration state set to clients asynchronously and depended on talking service being enabled."
Amith Yamasani [Mon, 25 Jul 2011 19:07:32 +0000 (12:07 -0700)]
Merge "Implement CollapsibleActionView on SearchView."
Winson Chung [Mon, 25 Jul 2011 18:47:43 +0000 (11:47 -0700)]
Merge "Preventing screenshots when waking from sleep."
Jamie Gennis [Mon, 25 Jul 2011 18:46:51 +0000 (11:46 -0700)]
Merge "SurfaceTexture: enable RGB external textures"
Svetoslav Ganov [Mon, 25 Jul 2011 18:23:56 +0000 (11:23 -0700)]
Merge "Switch state text not added to accessibility events."
Matthew Xie [Mon, 25 Jul 2011 18:14:25 +0000 (11:14 -0700)]
Merge "Keep Bluetooth module hot to quickly swith it on/off"
Jean-Michel Trivi [Mon, 25 Jul 2011 18:07:16 +0000 (11:07 -0700)]
Merge "Fix bug
4211099 channel constants and 7.1 mask"
Adam Powell [Mon, 25 Jul 2011 17:57:42 +0000 (10:57 -0700)]
Merge "Fix bug
5060033 - No text-editing toolbar when in a dialog"
Ted Bonkenburg [Mon, 25 Jul 2011 17:24:30 +0000 (10:24 -0700)]
Merge "Add support for creating a Surface from a a SurfaceTexture."
Ben Murdoch [Mon, 25 Jul 2011 16:41:46 +0000 (09:41 -0700)]
Merge "Add a System.Secure setting for the Autofill server URL."
Ben Murdoch [Mon, 25 Jul 2011 16:34:21 +0000 (09:34 -0700)]
Merge "Fix for Autofill calling WebView.getSettings on background thread."
Flavio Lerda [Mon, 25 Jul 2011 14:44:02 +0000 (07:44 -0700)]
Merge "Add IS_READ column in call log and voicemail providers."
satok [Mon, 25 Jul 2011 01:47:50 +0000 (18:47 -0700)]
Merge "[Step 2] Add apis for spell checker settings"
Daisuke Miyakawa [Mon, 25 Jul 2011 00:53:47 +0000 (17:53 -0700)]
Merge "Introduce param/column for group count"
Irfan Sheriff [Mon, 25 Jul 2011 00:14:12 +0000 (17:14 -0700)]
Merge "Fix interface notification race"
James Dong [Sun, 24 Jul 2011 21:40:08 +0000 (14:40 -0700)]
Merge "Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens"
Jean-Michel Trivi [Sun, 24 Jul 2011 19:59:35 +0000 (12:59 -0700)]
Merge "QueryCodecs() signature change"
repo sync [Sun, 24 Jul 2011 19:57:17 +0000 (12:57 -0700)]
Merge "Updated: Wi-Fi p2p framework"
Gloria Wang [Sun, 24 Jul 2011 19:07:20 +0000 (12:07 -0700)]
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."
Wink Saville [Sun, 24 Jul 2011 16:15:39 +0000 (09:15 -0700)]
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.
Kazuhiro Ondo [Sun, 24 Jul 2011 16:13:52 +0000 (09:13 -0700)]
am
9820a9d2: am
4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '
9820a9d299dc46f2a9037866ddf61c4782cf9186':
Allow suggestedRetryTime to indicate no retry is needed.
Wink Saville [Sun, 24 Jul 2011 16:13:26 +0000 (09:13 -0700)]
am
deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
* commit '
deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
Configure RAT dependent retry pattern in GSM DCT.
Kazuhiro Ondo [Sun, 24 Jul 2011 16:11:42 +0000 (09:11 -0700)]
am
4281817f: Allow suggestedRetryTime to indicate no retry is needed.
* commit '
4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
Wink Saville [Sun, 24 Jul 2011 16:11:28 +0000 (09:11 -0700)]
Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
Irfan Sheriff [Sun, 24 Jul 2011 05:30:36 +0000 (22:30 -0700)]
Merge "Handle hostapd and tether interface changes"
Svetoslav Ganov [Sun, 24 Jul 2011 02:38:47 +0000 (19:38 -0700)]
Merge "TwoStatePreference does not fire click events."
Mike Lockwood [Sun, 24 Jul 2011 02:36:32 +0000 (19:36 -0700)]
Merge "Fix USB tethering"
satok [Sat, 23 Jul 2011 06:17:51 +0000 (23:17 -0700)]
Merge "Tweak APIs for SpellChecker"
satok [Sat, 23 Jul 2011 03:14:27 +0000 (20:14 -0700)]
Merge "Display the current ime and subtype name in the ongoing notification"
Fabrice Di Meglio [Sat, 23 Jul 2011 02:24:52 +0000 (19:24 -0700)]
Merge "Code cleaning"
James Dong [Sat, 23 Jul 2011 00:59:10 +0000 (17:59 -0700)]
Merge "Deprecate two methods in MediaRecorder.java class"
Chia-chi Yeh [Sat, 23 Jul 2011 00:14:50 +0000 (17:14 -0700)]
Merge "VPN: increase timeout period to 60 seconds for legacy VPN."
Svetoslav Ganov [Sat, 23 Jul 2011 00:10:32 +0000 (17:10 -0700)]
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.
Svetoslav Ganov [Sat, 23 Jul 2011 00:07:28 +0000 (17:07 -0700)]
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.
Svetoslav Ganov [Sat, 23 Jul 2011 00:05:26 +0000 (17:05 -0700)]
Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE
Romain Guy [Fri, 22 Jul 2011 23:46:59 +0000 (16:46 -0700)]
Merge "Fix the build"
Pannag Sanketi [Fri, 22 Jul 2011 23:42:41 +0000 (16:42 -0700)]
Merge "Connect MediaRecorder Native to SurfaceMediaSource"
Ted Bonkenburg [Fri, 15 Jul 2011 22:10:10 +0000 (15:10 -0700)]
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
Jamie Gennis [Fri, 22 Jul 2011 23:24:03 +0000 (16:24 -0700)]
Merge changes Ibd261f7b,Ifdd234ef,I0e2f0bc3
* changes:
SurfaceTexture: add the abandon method.
SurfaceTexture: add a deadlock scenario test
SurfaceMediaSource: remove getAllocator method
Romain Guy [Fri, 22 Jul 2011 23:04:00 +0000 (16:04 -0700)]
Merge "Nested alpha animations should cause invalidates too Bug #
5041061"
Jamie Gennis [Wed, 20 Jul 2011 00:58:43 +0000 (17:58 -0700)]
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
Mathias Agopian [Fri, 22 Jul 2011 22:27:47 +0000 (15:27 -0700)]
Merge "Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT"
Mathias Agopian [Fri, 22 Jul 2011 22:25:20 +0000 (15:25 -0700)]
Fix typo which caused invalid rotations to be returned with NATIVE_WINDOW_TRANSFORM_HINT
Bug:
4487161
Change-Id: Ib2dfbbef15397b6d90695bd27f25849ca20704f1
Adam Powell [Fri, 22 Jul 2011 21:28:39 +0000 (14:28 -0700)]
Merge "Fix bug
5027071 - Action menu parent consistency"
Jamie Gennis [Tue, 19 Jul 2011 19:08:33 +0000 (12:08 -0700)]
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
Jamie Gennis [Thu, 21 Jul 2011 21:31:31 +0000 (14:31 -0700)]
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
Jamie Gennis [Fri, 22 Jul 2011 20:34:57 +0000 (13:34 -0700)]
Merge changes I799532f7,I5cffa6eb
* changes:
SurfaceTexture: fix a comment
SurfaceTexture: remove getAllocator
Robert Greenwalt [Fri, 22 Jul 2011 20:17:54 +0000 (13:17 -0700)]
am
19933916: am
ad55d351: Add better routes for secondary DNS
* commit '
199339169476d0d6d0ecaa8ed3bff3a9e9a0f430':
Add better routes for secondary DNS
Robert Greenwalt [Fri, 22 Jul 2011 20:15:56 +0000 (13:15 -0700)]
am
ad55d351: Add better routes for secondary DNS
* commit '
ad55d35114237071133eb28ded93a014185d4e35':
Add better routes for secondary DNS
Adam Cohen [Fri, 22 Jul 2011 19:27:37 +0000 (12:27 -0700)]
Merge "Fixing new minResizeWidth/Height API"
Pannag Sanketi [Fri, 22 Jul 2011 18:49:36 +0000 (11:49 -0700)]
Merge "Renaming SurfaceEncoder to SurfaceMediaSource"
Pannag Sanketi [Fri, 22 Jul 2011 18:49:21 +0000 (11:49 -0700)]
Merge "Adding SurfaceEncoder for encoding FilterFrames"
Irfan Sheriff [Fri, 22 Jul 2011 18:20:14 +0000 (11:20 -0700)]
Merge "Fixing WifiWatchdog log flag"
Dianne Hackborn [Fri, 22 Jul 2011 18:07:22 +0000 (11:07 -0700)]
Merge "Fix issue #
5054723: java.lang.NullPointerException at..."
Eric Laurent [Fri, 22 Jul 2011 18:04:07 +0000 (11:04 -0700)]
Merge "Fix issue
4988574: 8 bit PCM audio playback broken."
Dianne Hackborn [Fri, 22 Jul 2011 17:52:34 +0000 (10:52 -0700)]
Merge "Fix issue #
5050039: Launcher is sometimes rendering..."
Daniel Sandler [Fri, 22 Jul 2011 17:34:13 +0000 (10:34 -0700)]
Merge "Disable the number bubble overlay on notification icons."
Andreas Huber [Fri, 22 Jul 2011 17:25:24 +0000 (10:25 -0700)]
Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)."
Jesse Wilson [Fri, 22 Jul 2011 17:21:30 +0000 (10:21 -0700)]
Merge "Fix benign off-by-one in JsonReader."
James Dong [Fri, 22 Jul 2011 17:09:22 +0000 (10:09 -0700)]
Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."
Alex Sakhartchouk [Fri, 22 Jul 2011 16:52:27 +0000 (09:52 -0700)]
Merge "Fixing bitmap invalidation bug."
Gilles Debunne [Fri, 22 Jul 2011 16:24:31 +0000 (09:24 -0700)]
Merge "Minor dash typos in documentation"
Daisuke Miyakawa [Fri, 22 Jul 2011 15:05:55 +0000 (08:05 -0700)]
Merge "Introduce hidden API Contacts.CONTENT_FREQUENT_URI"
satok [Fri, 22 Jul 2011 11:11:49 +0000 (04:11 -0700)]
Merge "Delay load the settings for the ongoing ime swither"
satok [Fri, 22 Jul 2011 05:59:48 +0000 (22:59 -0700)]
Merge "Create TextServiceManager and SpellCheckerService"
Dianne Hackborn [Fri, 22 Jul 2011 05:37:13 +0000 (22:37 -0700)]
am
b0878223: am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
b0878223db87700cdc988a6d9197ca4e3c4772db':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Fri, 22 Jul 2011 05:35:32 +0000 (22:35 -0700)]
am
6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '
6800a80199477c90fc64af7211a177de06478a02':
frameworks/base: Cap the number of toasts that a package can post.
Dianne Hackborn [Fri, 22 Jul 2011 05:26:20 +0000 (22:26 -0700)]
am
1a2fcea1: am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:23:46 +0000 (22:23 -0700)]
am
2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '
2f4698fda46a3d2a6e78019588d77bae1cfa7193':
frameworks/base: unlink death notifications of Vibrate requests
Dianne Hackborn [Fri, 22 Jul 2011 05:21:19 +0000 (22:21 -0700)]
Merge "frameworks/base: Cap the number of toasts that a package can post."
Dianne Hackborn [Fri, 22 Jul 2011 05:18:47 +0000 (22:18 -0700)]
Merge "frameworks/base: unlink death notifications of Vibrate requests"
Dianne Hackborn [Fri, 22 Jul 2011 04:53:19 +0000 (21:53 -0700)]
Merge "Fix issue #
5061083: Handler.removeCallbacksAndMessages..."