OSDN Git Service
James Dong [Mon, 15 Nov 2010 21:31:54 +0000 (13:31 -0800)]
Merge "Fixed a race condition where some recording frames may not be released."
Wink Saville [Mon, 15 Nov 2010 21:24:37 +0000 (13:24 -0800)]
Merge "Move AsyncChannelTest and HierarchicalStateMachineTest to proper directory."
Vasu Nori [Mon, 15 Nov 2010 21:24:23 +0000 (13:24 -0800)]
Merge "map _data column to local_filename column. bug:
3197501"
Mathias Agopian [Mon, 15 Nov 2010 21:22:16 +0000 (13:22 -0800)]
am
f11bf284: am
305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
* commit '
f11bf284d355e2a8378c6a37a7ed702705ec6144':
Fix a race condition in sensormanager
Mathias Agopian [Mon, 15 Nov 2010 21:22:13 +0000 (13:22 -0800)]
am
99866c11: am
9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
* commit '
99866c111bd72a6cc9be17b127cd40ec9396ca7d':
Revert "allow all 4 orientations"
Mathias Agopian [Mon, 15 Nov 2010 21:19:46 +0000 (13:19 -0800)]
am
305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
* commit '
305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
Mathias Agopian [Mon, 15 Nov 2010 21:19:43 +0000 (13:19 -0800)]
am
9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
* commit '
9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
Derek Sollenberger [Mon, 15 Nov 2010 21:19:37 +0000 (13:19 -0800)]
Merge "Only show double-tap tip if the feature is enabled."
Mathias Agopian [Mon, 15 Nov 2010 21:14:59 +0000 (13:14 -0800)]
Merge "Fix a race condition in sensormanager" into gingerbread
Mathias Agopian [Mon, 15 Nov 2010 21:14:50 +0000 (13:14 -0800)]
Merge "Revert "allow all 4 orientations"" into gingerbread
Joe Onorato [Mon, 15 Nov 2010 20:23:51 +0000 (12:23 -0800)]
Merge "The beginnings of the new status bar."
James Dong [Mon, 15 Nov 2010 20:13:08 +0000 (12:13 -0800)]
Merge "Switch to use kKeyFrameRate for recordvideo utility"
Brad Fitzpatrick [Mon, 15 Nov 2010 19:31:05 +0000 (11:31 -0800)]
Merge "Close some things in system_server that CloseGuard found."
Mike Lockwood [Mon, 15 Nov 2010 19:27:47 +0000 (11:27 -0800)]
Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList"
Kenny Root [Mon, 15 Nov 2010 19:11:22 +0000 (11:11 -0800)]
Merge "Split UTF functions from String8/16"
Adam Cohen [Mon, 15 Nov 2010 19:09:59 +0000 (11:09 -0800)]
Merge "Fix for Issue:
3196583"
Wink Saville [Mon, 15 Nov 2010 19:00:49 +0000 (11:00 -0800)]
Merge "Add html formatting to AsyncChannel & Hsm class comments."
Brad Fitzpatrick [Mon, 15 Nov 2010 18:47:49 +0000 (10:47 -0800)]
Merge "Disable CloseGuard early. (it defaults to spammy otherwise)"
Brad Fitzpatrick [Mon, 15 Nov 2010 18:47:32 +0000 (10:47 -0800)]
Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"
Andreas Huber [Mon, 15 Nov 2010 18:07:38 +0000 (10:07 -0800)]
Merge "More HTTP live support, AES encryption etc."
Andreas Huber [Mon, 15 Nov 2010 18:07:31 +0000 (10:07 -0800)]
Merge "Refactor h.264 profile/level support into avc_utils."
Andreas Huber [Mon, 15 Nov 2010 18:07:24 +0000 (10:07 -0800)]
Merge "Provide bandwidth estimation support in NuHTTPDataSource"
Andreas Huber [Mon, 15 Nov 2010 18:07:17 +0000 (10:07 -0800)]
Merge "Add http live mime types to MediaFile, add support for playlist mime types to browser."
Adam Cohen [Mon, 15 Nov 2010 18:05:58 +0000 (10:05 -0800)]
Merge "Adding click feedback to StackView"
James Dong [Mon, 15 Nov 2010 17:57:33 +0000 (09:57 -0800)]
Merge "Remove legacy PV stuff"
Mike Lockwood [Mon, 15 Nov 2010 17:51:10 +0000 (09:51 -0800)]
Merge "MTP: Partial implementation of the GetObjectPropList command"
Justin Ho [Mon, 15 Nov 2010 17:16:13 +0000 (09:16 -0800)]
am
b9d3e359: (-s ours) am
868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit '
b9d3e35907e6b7e2c766f4813ab2e0463c920c37':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
Justin Ho [Mon, 15 Nov 2010 17:13:16 +0000 (09:13 -0800)]
am
868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
* commit '
868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
Justin Ho [Mon, 15 Nov 2010 17:10:33 +0000 (09:10 -0800)]
Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
Justin Ho [Mon, 15 Nov 2010 16:57:11 +0000 (08:57 -0800)]
am
dc04f537: (-s ours) am
a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit '
dc04f53703f68f0a4fb13858cbf71b760cf48368':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
Justin Ho [Mon, 15 Nov 2010 16:53:56 +0000 (08:53 -0800)]
am
a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
* commit '
a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
Justin Ho [Mon, 15 Nov 2010 16:50:19 +0000 (08:50 -0800)]
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
Mike Lockwood [Mon, 15 Nov 2010 16:39:00 +0000 (08:39 -0800)]
Merge "MediaScanner: Add support for importing file based playlists copied over MTP"
James Dong [Mon, 15 Nov 2010 16:13:30 +0000 (08:13 -0800)]
Merge "Disable flaky streaming server check"
James Dong [Mon, 15 Nov 2010 16:11:32 +0000 (08:11 -0800)]
Merge "Fix a typo in LOG_TAG for MediaPlayer unit tests"
Ben Murdoch [Mon, 15 Nov 2010 10:33:50 +0000 (02:33 -0800)]
Merge "Stop loading if the user cancels the SSL certificate warning dialog"
Adam Powell [Sat, 13 Nov 2010 03:19:19 +0000 (19:19 -0800)]
Merge "Revised assets for progress bars and indeterminate progress spinners."
Megha Joshi [Sat, 13 Nov 2010 03:16:06 +0000 (19:16 -0800)]
am
7bcccece: (-s ours) am
e2ef2c10: Fixing build (DO NOT MERGE)
* commit '
7bcccece88734fb714c417d9d263065212f59d24':
Fixing build (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 03:13:35 +0000 (19:13 -0800)]
am
e2ef2c10: Fixing build (DO NOT MERGE)
* commit '
e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
Fixing build (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:48:56 +0000 (18:48 -0800)]
am
7e059716: (-s ours) am
48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '
7e059716923cd02a4c42751c67892e090bfd5f33':
Adding NFC sample resources (DO NOT MERGE)
Megha Joshi [Sat, 13 Nov 2010 02:46:38 +0000 (18:46 -0800)]
am
48c698fc: Adding NFC sample resources (DO NOT MERGE)
* commit '
48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
Dianne Hackborn [Sat, 13 Nov 2010 02:18:15 +0000 (18:18 -0800)]
Merge "Change recents UIs to do task switches."
Brian Muramatsu [Fri, 12 Nov 2010 23:55:14 +0000 (15:55 -0800)]
Merge "Fix NPE in SQLiteDatabase#updateWithOnConflict"
Kenny Root [Tue, 9 Nov 2010 22:37:23 +0000 (14:37 -0800)]
Split UTF functions from String8/16
Split out all the UTF-8/16/32 handling code from String8/16 to its own
file to allow better reuse of code.
Change-Id: If9ce63920edc75472c38da4adce0d13cda9ad2f7
Vasu Nori [Fri, 12 Nov 2010 23:46:25 +0000 (15:46 -0800)]
Merge "remove unnecessary code from DownloadManager"
Gil Dobjanschi [Fri, 12 Nov 2010 23:39:16 +0000 (15:39 -0800)]
Merge "Transition invalidation bug fix."
James Dong [Fri, 12 Nov 2010 23:33:41 +0000 (15:33 -0800)]
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
satok [Fri, 12 Nov 2010 23:03:03 +0000 (15:03 -0800)]
Merge "Add a function to switch back to the last used IME"
Jason Sams [Fri, 12 Nov 2010 23:02:06 +0000 (15:02 -0800)]
Merge "Fix line drawing in RS example."
Jason Sams [Fri, 12 Nov 2010 23:01:07 +0000 (15:01 -0800)]
Merge "Document RS element and type and add validity checking to type creation."
Xavier Ducrohet [Fri, 12 Nov 2010 22:58:55 +0000 (14:58 -0800)]
Merge "Layoutlib: Fix alpha support in Canvas/Paint."
Xavier Ducrohet [Fri, 12 Nov 2010 22:58:48 +0000 (14:58 -0800)]
Merge "Layoutlib: Fill the default prop value map for View objects."
Jeff Brown [Thu, 11 Nov 2010 00:53:45 +0000 (16:53 -0800)]
Enable touch splitting for all windows by default.
New default only applies to applications with targetSdkVersion >=
HONEYCOMB. Old applications default to no touch splitting for
their windows.
In addition, enabled split touch for various system windows.
Bug:
3049580
Change-Id: Idc8da9baa2cd8e1e4e76af8967d7b6a5ccb94427
Brad Fitzpatrick [Fri, 12 Nov 2010 21:24:09 +0000 (13:24 -0800)]
Merge "Disable SamplingProfilerIntegration until it's fixed."
Shimeng (Simon) Wang [Fri, 12 Nov 2010 21:16:24 +0000 (13:16 -0800)]
Merge "Fix mobile sites' viewport in fixed viewport mode."
Gilles Debunne [Fri, 12 Nov 2010 20:23:00 +0000 (12:23 -0800)]
Merge "Added a flag for TextView that allows for text selection in read-only TextViews."
Adam Cohen [Fri, 12 Nov 2010 19:38:35 +0000 (11:38 -0800)]
Merge "-Prevent StackView from advancing while interacting with it -Fixed null pointer exception Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297"
Leon Scroggins [Fri, 12 Nov 2010 19:20:13 +0000 (11:20 -0800)]
Merge "Provide variable for debugging the text in WebTextView."
Jason Sams [Fri, 12 Nov 2010 19:15:59 +0000 (11:15 -0800)]
Merge "More documentation."
Tor Norbye [Fri, 12 Nov 2010 18:43:46 +0000 (10:43 -0800)]
Merge "Fix fill color alpha in layoutlib"
Adam Powell [Fri, 12 Nov 2010 18:37:50 +0000 (10:37 -0800)]
Merge "Fix bug
3146938 - Menus spawned by ActionBar should hide when action bar is hidden"
Alon Albert [Fri, 12 Nov 2010 17:57:49 +0000 (09:57 -0800)]
Merge "Improve logging"
Jaikumar Ganesh [Fri, 12 Nov 2010 17:45:10 +0000 (09:45 -0800)]
Merge "Don't call cancel discovery when its already canceelled."
Robert Greenwalt [Fri, 12 Nov 2010 16:50:50 +0000 (08:50 -0800)]
Merge "Make getDataEnabled take more into account."
Gil Dobjanschi [Fri, 12 Nov 2010 03:09:25 +0000 (19:09 -0800)]
Merge "Invalidate transitions when an image media item duration changes."
Jeff Brown [Fri, 12 Nov 2010 02:47:57 +0000 (18:47 -0800)]
Merge "Add new keycodes initially used for GoogleTV devices."
Adam Powell [Fri, 12 Nov 2010 02:41:33 +0000 (18:41 -0800)]
Merge "Bug
3183184 - add fade-out for selectable item backgrounds"
Jason Bayer [Tue, 9 Nov 2010 22:54:55 +0000 (14:54 -0800)]
Add new keycodes initially used for GoogleTV devices.
Change-Id: I1b901037d6d401931dd3ec6f7d5e1e6ad165d1c9
Xavier Ducrohet [Fri, 12 Nov 2010 01:43:28 +0000 (17:43 -0800)]
Merge "Misc fix in layoutlib bridge + View.isIneditMode as delegate."
Eric Laurent [Fri, 12 Nov 2010 01:24:27 +0000 (17:24 -0800)]
Merge "Temporary workaround for issue
3187563"
Andreas Huber [Fri, 12 Nov 2010 01:15:52 +0000 (17:15 -0800)]
Merge "Increase the prefetcher's low water mark so it restarts fetching data earlier."
Scott Main [Fri, 12 Nov 2010 01:12:32 +0000 (17:12 -0800)]
am
16555c60: am
d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit '
16555c60f7231b014375cbc62fd83b1c53879984':
docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
Wink Saville [Fri, 12 Nov 2010 01:04:38 +0000 (17:04 -0800)]
Merge "GsmServiceStateTracker#getPhone should be protected not public."
Scott Main [Fri, 12 Nov 2010 01:02:54 +0000 (17:02 -0800)]
am
d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
* commit '
d6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
Scott Main [Fri, 12 Nov 2010 00:56:19 +0000 (16:56 -0800)]
Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
Elliott Hughes [Fri, 12 Nov 2010 00:54:07 +0000 (16:54 -0800)]
Merge "Use deliberately public API rather than org.apache cruft."
Vasu Nori [Fri, 12 Nov 2010 00:35:43 +0000 (16:35 -0800)]
Merge "add column to downloads table to store error msg when a download fails"
Adam Powell [Fri, 12 Nov 2010 00:04:09 +0000 (16:04 -0800)]
Merge "First pass at styling progress bars for Holo."
Eric Fischer [Thu, 11 Nov 2010 23:53:19 +0000 (15:53 -0800)]
am
9acf04ab: (-s ours) am
3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
9acf04ab6a6327449f46e83679ec54967e092944':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:49:03 +0000 (15:49 -0800)]
am
3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3082e5fed04c42301c89de8df36e9d62f0937dec':
Import revised translations. DO NOT MERGE
Andreas Huber [Thu, 11 Nov 2010 23:45:04 +0000 (15:45 -0800)]
Merge "Make sure the prefetcher is actively fetching data if we pause playback due to cache underrun."
Eric Fischer [Thu, 11 Nov 2010 23:44:04 +0000 (15:44 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Romain Guy [Thu, 11 Nov 2010 23:42:35 +0000 (15:42 -0800)]
Merge "Free resources only from the GL context thread. Bug #
3179882"
Jaikumar Ganesh [Thu, 11 Nov 2010 23:38:21 +0000 (15:38 -0800)]
Merge "Fix crash in dump function."
Jamie Gennis [Thu, 11 Nov 2010 23:26:21 +0000 (15:26 -0800)]
Merge "Implement reducing the buffer count of a Surface."
Mathias Agopian [Thu, 11 Nov 2010 22:52:37 +0000 (14:52 -0800)]
am
792b847e: am
fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread
* commit '
792b847ee117c3c21b2859635caa7e7ec39d9c20':
record the last event received regardless of having clients or not
Mathias Agopian [Thu, 11 Nov 2010 22:49:35 +0000 (14:49 -0800)]
am
fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread
* commit '
fcab475c906da5c159bc56a32c2610f6f55eafd9':
record the last event received regardless of having clients or not
Mathias Agopian [Thu, 11 Nov 2010 22:44:08 +0000 (14:44 -0800)]
Merge "record the last event received regardless of having clients or not" into gingerbread
Jamie Gennis [Tue, 2 Nov 2010 18:51:32 +0000 (11:51 -0700)]
Implement reducing the buffer count of a Surface.
Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f
Bug:
3095167
James Dong [Thu, 11 Nov 2010 22:06:30 +0000 (14:06 -0800)]
Merge "Fix memory leak when 0-memcpy quirk is used"
Chet Haase [Thu, 11 Nov 2010 22:04:10 +0000 (14:04 -0800)]
Merge "Add invalidation to Drawable when its properties change"
Jamie Gennis [Thu, 11 Nov 2010 21:50:43 +0000 (13:50 -0800)]
Merge "Fix a compile warning in the Surface class."
Jamie Gennis [Thu, 11 Nov 2010 21:49:38 +0000 (13:49 -0800)]
Merge "Remove a problematic empty update optimization."
Gilles Debunne [Thu, 11 Nov 2010 21:46:17 +0000 (13:46 -0800)]
Merge "Lock screen should not display password."
Jamie Gennis [Wed, 10 Nov 2010 02:01:27 +0000 (18:01 -0800)]
Fix a compile warning in the Surface class.
Change-Id: Id744e71d2cd23c287925a5090e13a6d9908cdd99
Mike Lockwood [Thu, 11 Nov 2010 21:15:57 +0000 (13:15 -0800)]
Merge "MediaFile: Recognize MPG file extension as MPEG video"
Xavier Ducrohet [Thu, 11 Nov 2010 20:25:01 +0000 (12:25 -0800)]
Merge "Layoutlib: New bridge implementation using the new API 5."
Steve Block [Thu, 11 Nov 2010 20:19:28 +0000 (12:19 -0800)]
Merge changes Ib82f897a,I2d689d0f
* changes:
Fix EventSender mouse events to correctly convert from screen coordinates
Refactor EventSenderImpl.MousePoint
Romain Guy [Thu, 11 Nov 2010 20:18:03 +0000 (12:18 -0800)]
Merge "Reduce number of GL calls when drawing with shaders."
Leon Scroggins [Thu, 11 Nov 2010 19:41:07 +0000 (11:41 -0800)]
Merge "Ensure that text passed in is non-null."