OSDN Git Service
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"
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"
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 04:53:19 +0000 (21:53 -0700)]
Merge "Fix issue #
5061083: Handler.removeCallbacksAndMessages..."
Mathias Agopian [Fri, 22 Jul 2011 03:34:47 +0000 (20:34 -0700)]
Merge "Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT"
Michael Jurka [Fri, 22 Jul 2011 02:57:54 +0000 (19:57 -0700)]
Merge "Prevent notification swipes from getting canceled too soon."
Adam Powell [Fri, 22 Jul 2011 02:33:26 +0000 (19:33 -0700)]
Merge "Fix bug
5037537 - Revert "ListView focus bugfix.""
Daniel Sandler [Fri, 22 Jul 2011 02:05:35 +0000 (19:05 -0700)]
Merge "Subtract the navbar's bounds from fullscreen windows."
Dianne Hackborn [Fri, 22 Jul 2011 01:51:45 +0000 (18:51 -0700)]
Merge "Move status bar above keyguard."
JP Abgrall [Fri, 22 Jul 2011 01:44:52 +0000 (18:44 -0700)]
Merge "NetworkManagementService: receive bandwidth controller events"
Adam Powell [Fri, 22 Jul 2011 01:22:02 +0000 (18:22 -0700)]
Merge "Bug
5061529 - Save/restore action view state for menu items across invalidations."
Kazuhiro Ondo [Fri, 22 Jul 2011 01:19:21 +0000 (18:19 -0700)]
am
b7ad442c: am
1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit '
b7ad442c90146f736c6268c21e34a87fbcab6335':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Kazuhiro Ondo [Fri, 22 Jul 2011 01:15:26 +0000 (18:15 -0700)]
am
1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit '
1c82f56f2453a8a7c83090017ab2427a74829b9a':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Pannag Sanketi [Fri, 22 Jul 2011 01:11:00 +0000 (18:11 -0700)]
Merge "Adding AndoirdOpaque Colorformat to OMX"
Romain Guy [Fri, 22 Jul 2011 01:07:16 +0000 (18:07 -0700)]
Merge "Ouput looper traces as traceview traces"
Dianne Hackborn [Fri, 22 Jul 2011 00:53:51 +0000 (17:53 -0700)]
Merge "Fix issue #
5021385: Title of any Settings subscreen changes..."
Jeff Brown [Fri, 22 Jul 2011 00:44:08 +0000 (17:44 -0700)]
Merge "Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList. Bug:
5062011"
Chia-chi Yeh [Fri, 22 Jul 2011 00:37:11 +0000 (17:37 -0700)]
Merge "VPN: add VpnBuilder as the public API of user space VPN."
Adam Powell [Fri, 22 Jul 2011 00:33:00 +0000 (17:33 -0700)]
Merge "Fix bug
5048482 - mischievous monkeys editing text in IME extract mode"
Michael Jurka [Fri, 22 Jul 2011 00:13:13 +0000 (17:13 -0700)]
Merge "Fix crash in recents"
Pannag Sanketi [Sat, 11 Jun 2011 01:30:30 +0000 (18:30 -0700)]
Adding SurfaceEncoder for encoding FilterFrames
Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.
SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.
Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.
The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.
Related to bug id:
4529323
Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
John Wang [Fri, 22 Jul 2011 00:06:08 +0000 (17:06 -0700)]
Merge "Remove APN type in notifyDataConnection."
Jaikumar Ganesh [Thu, 21 Jul 2011 23:27:55 +0000 (16:27 -0700)]
Merge "Auto Pairing tweaks."
Mike Lockwood [Thu, 21 Jul 2011 23:24:27 +0000 (16:24 -0700)]
Merge "UsbDeviceManager: Add USB notification string for USB accessory mode"
Mike Lockwood [Thu, 21 Jul 2011 23:24:18 +0000 (16:24 -0700)]
Merge "USB: Fix handling USB accessory attached when device is booting"
John Reck [Thu, 21 Jul 2011 23:21:13 +0000 (16:21 -0700)]
Merge "Fixup handling destroy"
Dianne Hackborn [Thu, 21 Jul 2011 23:19:11 +0000 (16:19 -0700)]
Merge "Fix bug where memory trim was not being delivered with correct level."
Fabrice Di Meglio [Thu, 21 Jul 2011 23:12:43 +0000 (16:12 -0700)]
Merge "Fix CheckTextView padding"
Chris Craik [Thu, 21 Jul 2011 22:59:17 +0000 (15:59 -0700)]
Merge "New log format, Manual log generation, plus logging of invalidates"
Jeff Hamilton [Thu, 21 Jul 2011 22:57:41 +0000 (15:57 -0700)]
Merge "Make READ_FRAME_BUFFER signatureOrSystem."
Romain Guy [Thu, 21 Jul 2011 22:31:59 +0000 (15:31 -0700)]
Merge "Add looper profiling to adb shell am"
Mathias Agopian [Thu, 21 Jul 2011 21:50:29 +0000 (14:50 -0700)]
Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT
- fixed uninitialized variable
- set hint to indentity when transform is too complex
- make sure FrameBufferNativeWindow doesn't fail on needed perform commands
Bug:
4487161
Change-Id: I7cb2b0869b72404732eca7cb2d145ff669e2ed9b
Jamie Gennis [Tue, 19 Jul 2011 19:11:52 +0000 (12:11 -0700)]
SurfaceTexture: fix a comment
Change-Id: I799532f77f8fbb6b8ee6888fdd8852b6f28e8c33
Jamie Gennis [Tue, 19 Jul 2011 21:32:36 +0000 (14:32 -0700)]
SurfaceTexture: remove getAllocator
This change removes the SurfaceTexture::getAllocator method, as it's no
longer needed. Proper refcounting of the Gralloc buffers is now handled
by the IGraphicBufferAlloc binder marshalling code.
Change-Id: I5cffa6ebfc1bc5828fb7ce0e0a5b2f55cd8479da
Irfan Sheriff [Thu, 21 Jul 2011 20:45:38 +0000 (13:45 -0700)]
Merge "Fix multicast API"
Gilles Debunne [Thu, 21 Jul 2011 20:33:13 +0000 (13:33 -0700)]
Merge "Bug
4534376: Suggestion popup is not clipped."
Svetoslav Ganov [Thu, 21 Jul 2011 20:11:44 +0000 (13:11 -0700)]
Merge "Adding accessibility support to the Status Bar."
Adam Powell [Thu, 21 Jul 2011 20:10:28 +0000 (13:10 -0700)]
Merge "Bug
4948805 - fix custom title divider for dialogs"
Jaikumar Ganesh [Thu, 21 Jul 2011 18:53:44 +0000 (11:53 -0700)]
Merge "Incoming connection dialog tweaks."
Svetoslav Ganov [Thu, 21 Jul 2011 18:48:57 +0000 (11:48 -0700)]
Merge "Activity selections not always persisted by AcitivtyChooserView."
Jaikumar Ganesh [Thu, 21 Jul 2011 18:43:03 +0000 (11:43 -0700)]
Merge "Fix notification manager delete intent."
Irfan Sheriff [Thu, 21 Jul 2011 18:28:51 +0000 (11:28 -0700)]
Merge "WifiWatchdogSM notification for first wifi disable"
Hong Teng [Thu, 21 Jul 2011 18:13:43 +0000 (11:13 -0700)]
Merge "fix for issue
4142219 Don't hard code platform-specific limitations-jni/java part"
Huahui Wu [Thu, 21 Jul 2011 18:08:55 +0000 (11:08 -0700)]
Merge "b/
4070489 Jumpy motion when switching fingers during zoom gesture."
The Android Open Source Project [Thu, 21 Jul 2011 14:24:01 +0000 (07:24 -0700)]
Reconcile with gingerbread-mr4-release
Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a
Narayan Kamath [Thu, 21 Jul 2011 12:12:34 +0000 (05:12 -0700)]
Merge "Fix some AudioTrack related issues."
Martijn Coenen [Thu, 21 Jul 2011 07:32:11 +0000 (00:32 -0700)]
Merge "Support for getTimeout() (API)."
Jeff Hamilton [Thu, 21 Jul 2011 04:54:15 +0000 (21:54 -0700)]
Merge "Remove the hidden My Tag APIs."
Eric Laurent [Thu, 21 Jul 2011 02:25:34 +0000 (19:25 -0700)]
Merge "AudioRecord JAVA: expose audio session Id"
Matthew Xie [Thu, 21 Jul 2011 02:08:38 +0000 (19:08 -0700)]
Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled"
Xavier Ducrohet [Thu, 21 Jul 2011 01:56:52 +0000 (18:56 -0700)]
am
b3ab070e: am
3a2d1c23: am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:55:21 +0000 (18:55 -0700)]
am
3a2d1c23: am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
Fix to compile for windows
Xavier Ducrohet [Thu, 21 Jul 2011 01:53:08 +0000 (18:53 -0700)]
am
ddb8e3b2: am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
Mathias Agopian [Thu, 21 Jul 2011 01:52:51 +0000 (18:52 -0700)]
Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"
Mathias Agopian [Thu, 21 Jul 2011 01:52:21 +0000 (18:52 -0700)]
Merge "silence sensorservice when it's dropping events"
Xavier Ducrohet [Thu, 21 Jul 2011 01:49:46 +0000 (18:49 -0700)]
am
9bac0a9f: Merge "Fix to compile for windows"
* commit '
9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
Romain Guy [Thu, 21 Jul 2011 01:47:49 +0000 (18:47 -0700)]
Merge "Convert looper traces to traceview traces"
Xavier Ducrohet [Thu, 21 Jul 2011 01:35:35 +0000 (18:35 -0700)]
Merge "Fix to compile for windows"
Dirk Dougherty [Thu, 21 Jul 2011 01:05:56 +0000 (18:05 -0700)]
Merge "Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant."
Jeff Brown [Thu, 21 Jul 2011 01:03:47 +0000 (18:03 -0700)]
Merge "Untangle MediaScanner error handling. Bug:
5056917"
Gilles Debunne [Thu, 21 Jul 2011 00:51:36 +0000 (17:51 -0700)]
Merge "Suggestions are dismissed by back key"
Xavier Ducrohet [Thu, 21 Jul 2011 00:49:26 +0000 (17:49 -0700)]
am
84be06e4: resolved conflicts for merge of
ea9e6d24 to honeycomb-plus-aosp
* commit '
84be06e4ce0778fbf0c1ac72f94795ef8433439b':
Added Caching for PreProcessed PNGs
Eric Laurent [Thu, 21 Jul 2011 00:45:37 +0000 (17:45 -0700)]
Merge "Audio framework: support for audio pre processing"
Xavier Ducrohet [Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)]
resolved conflicts for merge of
ea9e6d24 to honeycomb-plus-aosp
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
Jeff Brown [Thu, 21 Jul 2011 00:42:36 +0000 (17:42 -0700)]
Merge "Remove unimplemented memory pool."
Dirk Dougherty [Thu, 21 Jul 2011 00:35:28 +0000 (17:35 -0700)]
Merge "Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13."
Xavier Ducrohet [Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)]
am
a125c937: resolved conflicts for merge of
2c311be7 to honeycomb-plus-aosp
* commit '
a125c937de06b1cc43368743592f47513eb88b76':
Add generation of dependency file for .ap_ package
Mathias Agopian [Wed, 20 Jul 2011 23:46:11 +0000 (16:46 -0700)]
clean-up. get rid ofunused code and members in Surface[Control].cpp
Change-Id: Ia7790ae28af2c2ac99eae01c2c5044ace4a490a4
Xavier Ducrohet [Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)]
resolved conflicts for merge of
2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe