OSDN Git Service
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:05:14 +0000 (14:05 -0800)]
Merge from open-source gingerbread
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
Jean-Baptiste Queru [Thu, 3 Feb 2011 22:02:59 +0000 (14:02 -0800)]
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Scott Main [Thu, 3 Feb 2011 00:38:25 +0000 (16:38 -0800)]
Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)]
Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:44:16 +0000 (09:44 -0800)]
Merge "fix for supporting 3 digits MNC code" into gingerbread
Nick Pelly [Tue, 1 Feb 2011 17:39:31 +0000 (09:39 -0800)]
Merge "Final final final Gingerbread MR API changes." into gingerbread
Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
Eric Fischer [Tue, 1 Feb 2011 00:08:52 +0000 (16:08 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Eric Laurent [Fri, 28 Jan 2011 02:37:04 +0000 (18:37 -0800)]
Merge "Fix issue
2988031." into gingerbread
Jim Miller [Fri, 28 Jan 2011 02:22:14 +0000 (18:22 -0800)]
Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
Nick Pelly [Fri, 28 Jan 2011 00:23:35 +0000 (16:23 -0800)]
Merge "API: Make close() throw an IOException." into gingerbread
Eric Fischer [Thu, 27 Jan 2011 22:56:29 +0000 (14:56 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Scott Main [Thu, 27 Jan 2011 21:25:10 +0000 (13:25 -0800)]
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 20:23:53 +0000 (12:23 -0800)]
Merge "Clean up MifareUltralight API." into gingerbread
Robert Greenwalt [Thu, 27 Jan 2011 18:17:33 +0000 (10:17 -0800)]
Merge "Update networktype before sending state change." into gingerbread
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Dianne Hackborn [Wed, 26 Jan 2011 21:59:42 +0000 (13:59 -0800)]
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
Kenny Root [Wed, 26 Jan 2011 17:17:28 +0000 (09:17 -0800)]
Merge "Make OBB results a one-way call" into gingerbread
Ritu Srivastava [Wed, 26 Jan 2011 00:23:08 +0000 (16:23 -0800)]
fix failing thread object run
A previously exited Thread object refuses to run again, if the
thread-id of the caller, conincides with the thread-id it previously
used in the worker thread. Hence reset the previously used worker
thread-id to -1 when it exits.
Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com>
Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Jeff Hamilton [Wed, 26 Jan 2011 00:11:37 +0000 (16:11 -0800)]
Merge "Fix the build, proper current.xml." into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:21 +0000 (14:43 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:14 +0000 (14:43 -0800)]
Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:09 +0000 (14:43 -0800)]
Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:43:05 +0000 (14:43 -0800)]
Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 25 Jan 2011 22:42:59 +0000 (14:42 -0800)]
Merge "minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
Jeff Hamilton [Tue, 25 Jan 2011 22:35:46 +0000 (14:35 -0800)]
Merge "Use classnames instead of ints for NFC techs." into gingerbread
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Mathias Agopian [Sat, 15 Jan 2011 01:37:42 +0000 (17:37 -0800)]
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
We used to guarantee that a layer in SurfaceFlinger would never be
destroyed before all references (to its ISurface) on the client
side would be released. At some point, this guarantee got
relaxed to allow to free gralloc resources sooner. This last
change was incorrect, because:
- in implementations with reference-counting the gralloc resources
wouldn't be released anyways, until all the mapping were gone
- in implementations without ref counting, the client side
would most likely crash or do something bad
- it also caused the SharedBufferStack slot to be reallocated
to another surface, which could be problematic if the client
continued to use the surface after the window manager destroyed it.
So, we essentially reinstate the guarantee that layers won't be
destroyed until after all references to their ISurface are
released.
NOTE: This doesn't entirely fix
3306150 because there is another
problem there where the Browser continues to use a surface after it
has been destroyed.
also improve SurfaceFlinger 'dumpsys' log
list the purgatory, which shows windows that have been closed,
but for which the client still has references.
Mathias Agopian [Fri, 17 Dec 2010 02:46:17 +0000 (18:46 -0800)]
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
we were not clearing the screen entirely, which caused garbage when
the screen wasn't entirely covered by windows.
Change-Id: Ia7aa13c36a8a314e0e8427d419b16b9aa2165ddf
Mathias Agopian [Wed, 15 Dec 2010 22:41:59 +0000 (14:41 -0800)]
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
we make sure to call compositionComplete after everytime we do
composition with the GPU (even for the screenshot case), which is
where the buffer locks are released.
Change-Id: I450430d1e4d1ee9ce1023970642378c42cdcfa4c
Mathias Agopian [Tue, 14 Dec 2010 00:47:31 +0000 (16:47 -0800)]
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Change-Id: I1ddbbbec4fa5b2521ef3787bc28efe1bc90d0060
Marco Nelissen [Tue, 25 Jan 2011 18:06:16 +0000 (10:06 -0800)]
Merge "Increase the number of useful bits in the spectrum." into gingerbread
Hung-ying Tyan [Tue, 25 Jan 2011 05:13:08 +0000 (21:13 -0800)]
Merge "Get mute state from active call." into gingerbread
Hung-ying Tyan [Tue, 25 Jan 2011 03:41:42 +0000 (19:41 -0800)]
Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* changes:
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
John Wang [Mon, 24 Jan 2011 17:14:14 +0000 (09:14 -0800)]
Merge "Enable recovery in RIL wakelock release check." into gingerbread
Nick Pelly [Mon, 24 Jan 2011 06:12:25 +0000 (22:12 -0800)]
Merge "Add operands to mifare classic increment, decrement." into gingerbread
Nick Pelly [Mon, 24 Jan 2011 05:36:14 +0000 (21:36 -0800)]
Merge "Make MifareClassic methods more consistent." into gingerbread
Jeff Hamilton [Mon, 24 Jan 2011 03:17:22 +0000 (19:17 -0800)]
Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
Jaikumar Ganesh [Sat, 22 Jan 2011 05:25:01 +0000 (21:25 -0800)]
Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
John Reck [Fri, 21 Jan 2011 22:03:30 +0000 (14:03 -0800)]
Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbread
Jeff Hamilton [Fri, 21 Jan 2011 19:34:20 +0000 (11:34 -0800)]
Merge "API changes for NFC." into gingerbread
Jean-Michel Trivi [Fri, 21 Jan 2011 17:09:30 +0000 (09:09 -0800)]
Merge "Bug
3365937 notify TTS initialization listener of binding errors" into gingerbread
Eric Laurent [Fri, 21 Jan 2011 01:43:04 +0000 (17:43 -0800)]
Merge "do not merge - Fix issue
3371096." into gingerbread
Dave Sparks [Thu, 20 Jan 2011 03:23:32 +0000 (19:23 -0800)]
Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
Mathias Agopian [Thu, 20 Jan 2011 01:32:21 +0000 (17:32 -0800)]
Merge "fix [
3369027] Sensor.TYPE_ROTATION_VECTOR is unstable and returns NaNs when running slowly" into gingerbread
Jeff Brown [Thu, 20 Jan 2011 01:03:03 +0000 (17:03 -0800)]
Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerbread
Mathias Agopian [Wed, 19 Jan 2011 19:31:07 +0000 (11:31 -0800)]
Merge "Use EGL_NATIVE_VISUAL_ID to select EGLConfig" into gingerbread
Andreas Huber [Wed, 19 Jan 2011 16:11:39 +0000 (08:11 -0800)]
Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
Nick Pelly [Wed, 19 Jan 2011 02:53:42 +0000 (18:53 -0800)]
Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread
Nick Pelly [Wed, 19 Jan 2011 02:53:40 +0000 (18:53 -0800)]
Merge "Support for TagLostException (API)." into gingerbread
Brad Fitzpatrick [Wed, 19 Jan 2011 02:52:04 +0000 (18:52 -0800)]
Merge "Watchdog can get deadlocked on activity manager" into gingerbread
Nick Pelly [Wed, 19 Jan 2011 01:07:56 +0000 (17:07 -0800)]
Merge "Fix javadoc which broke build." into gingerbread
Eric Laurent [Wed, 19 Jan 2011 00:42:20 +0000 (16:42 -0800)]
Merge "Fix omission in NOTICE file." into gingerbread
Nick Pelly [Wed, 19 Jan 2011 00:11:14 +0000 (16:11 -0800)]
Merge "hange the default IsoDep timeout to 300ms (docs update)." into gingerbread
Mathias Agopian [Wed, 19 Jan 2011 00:10:08 +0000 (16:10 -0800)]
Merge "fix [
3355413] Gyro calls onAccuracyChanged and reports accuracy as UNRELIABLE" into gingerbread
Amith Yamasani [Tue, 18 Jan 2011 23:41:26 +0000 (15:41 -0800)]
Merge "Set the default state of NOTIFICATIONS_USE_RING_VOLUME to true." into gingerbread
Eric Laurent [Tue, 18 Jan 2011 23:25:32 +0000 (15:25 -0800)]
Fix omission in NOTICE file.
Added copyright notice for audio effects source files under
media/libeffects/lvm.
Change-Id: I8e142bacb7e4b1faaeafe88e907b73f21fced1c3
Irfan Sheriff [Tue, 18 Jan 2011 22:40:18 +0000 (14:40 -0800)]
Merge "Do not add unsolicited events to queue" into gingerbread
Jeff Brown [Tue, 18 Jan 2011 22:31:31 +0000 (14:31 -0800)]
Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbread
Mathias Agopian [Tue, 18 Jan 2011 19:20:04 +0000 (11:20 -0800)]
Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread
Jeff Hamilton [Tue, 18 Jan 2011 19:01:55 +0000 (11:01 -0800)]
Merge "Javadoc updates for NFC." into gingerbread
Jeff Hamilton [Tue, 18 Jan 2011 19:01:05 +0000 (11:01 -0800)]
Merge "New APIs for NDEF Push Protocol." into gingerbread
Mathias Agopian [Mon, 17 Jan 2011 01:57:20 +0000 (17:57 -0800)]
Use EGL_NATIVE_VISUAL_ID to select EGLConfig
EGLUtils::selectConfigForPixelFormat() now uses EGL_NATIVE_VISUAL_ID
to select a config with the proper format. this is more robust and
future proof.
Change-Id: Ib85e0974160945d838956b50a3cac4de78618957
Jamie Gennis [Mon, 20 Dec 2010 19:05:18 +0000 (11:05 -0800)]
Fix the ISurfaceComposer onTransact switch.
Two of the cases in the ISurfaceComposer onTransact switch statement
were missing 'break' statements at the end, and would fall through to
the next case block. This change adds those break statements.
Change-Id: I6dcc84263d3ea03d94612c667103283846b3dee1
Jeff Brown [Mon, 17 Jan 2011 00:15:32 +0000 (16:15 -0800)]
Merge "Flush Binder commands in ndk looper." into gingerbread
Jim Miller [Mon, 17 Jan 2011 00:14:52 +0000 (16:14 -0800)]
Merge "Fix
3106227: use WeakReferences for receivers in DigitalClock class" into gingerbread
Nick Pelly [Sat, 15 Jan 2011 02:18:25 +0000 (18:18 -0800)]
Merge "Make sure service handles are live before passing to other objects." into gingerbread
James Dong [Sat, 15 Jan 2011 00:27:48 +0000 (16:27 -0800)]
Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
Jaikumar Ganesh [Sat, 15 Jan 2011 00:11:41 +0000 (16:11 -0800)]
Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread
Dianne Hackborn [Fri, 14 Jan 2011 23:36:26 +0000 (15:36 -0800)]
Merge "Added check to make orientation calculations more robust" into gingerbread
Dianne Hackborn [Fri, 14 Jan 2011 23:33:44 +0000 (15:33 -0800)]
Merge "Make the Phone options dialog use current language" into gingerbread
Eric Fischer [Thu, 13 Jan 2011 21:08:18 +0000 (13:08 -0800)]
Merge "Add date format and map center resources for new locales." into gingerbread
Wei-Ta Chen [Thu, 13 Jan 2011 20:02:32 +0000 (12:02 -0800)]
Merge "Do not merge." into gingerbread
Dan Morrill [Thu, 13 Jan 2011 17:24:01 +0000 (09:24 -0800)]
Adding ASL2 attribution for VisualOn.
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
Nick Pelly [Thu, 13 Jan 2011 00:28:59 +0000 (16:28 -0800)]
Merge "New Intent defined for RF ON/OFF events" into gingerbread
Kenny Root [Wed, 12 Jan 2011 23:03:43 +0000 (15:03 -0800)]
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
Jaikumar Ganesh [Wed, 12 Jan 2011 21:56:13 +0000 (13:56 -0800)]
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
Eric Laurent [Wed, 12 Jan 2011 21:50:51 +0000 (13:50 -0800)]
Merge "Fix issue
3302649." into gingerbread
Justin Ho [Wed, 12 Jan 2011 21:47:59 +0000 (13:47 -0800)]
Merge "Updated flightmode assets" into gingerbread
Kenny Root [Wed, 12 Jan 2011 19:56:25 +0000 (11:56 -0800)]
Merge "Allow updated system apps to retain priority" into gingerbread
Jeff Brown [Sun, 24 Oct 2010 21:39:33 +0000 (14:39 -0700)]
Filter virtual keys after touches. (DO NOT MERGE)
Adds a new virtualKeyQuietTimeMillis configuration resource that sets
the duration for which virtual keys will be dropped after recent touches
on screen. The default value is 0; it is intended to be overridden
per device using a resource overlay.
This change is designed to help in two cases:
1. Swipes from touchscreen into virtual key area.
2. Accidental taps in virtual key area while using on-screen keyboard.
Bug:
3089163
Change-Id: Id6733c83c2e2bc8d9553aa0e5c1fd74b741bec6e
Andreas Huber [Tue, 11 Jan 2011 21:52:12 +0000 (13:52 -0800)]
Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
Chung-yih Wang [Tue, 11 Jan 2011 10:08:19 +0000 (02:08 -0800)]
Merge "Add auth. username in SipProfile." into gingerbread
James Dong [Mon, 10 Jan 2011 20:04:50 +0000 (12:04 -0800)]
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:36 +0000 (12:02 -0800)]
Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:26 +0000 (12:02 -0800)]
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
Dianne Hackborn [Sun, 9 Jan 2011 21:53:53 +0000 (13:53 -0800)]
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
Dianne Hackborn [Sun, 9 Jan 2011 19:38:15 +0000 (11:38 -0800)]
Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
Yu Shan Emily Lau [Fri, 7 Jan 2011 17:38:24 +0000 (09:38 -0800)]
Merge "Fix the test application orientation. Bug#
3205196" into gingerbread
Gilles Debunne [Fri, 7 Jan 2011 02:30:26 +0000 (18:30 -0800)]
Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
Gilles Debunne [Fri, 7 Jan 2011 02:29:59 +0000 (18:29 -0800)]
Merge "Asset cleanup. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 6 Jan 2011 22:11:47 +0000 (14:11 -0800)]
Merge "Import translations for additional languages." into gingerbread