OSDN Git Service
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:50:29 +0000 (15:50 -0800)]
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:31:30 +0000 (15:31 -0800)]
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
Brad Fitzpatrick [Fri, 19 Nov 2010 15:41:39 +0000 (07:41 -0800)]
Merge "Improve performance when getting styled string."
Jean-Baptiste Queru [Thu, 18 Nov 2010 02:40:31 +0000 (18:40 -0800)]
Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:58:14 +0000 (17:58 -0800)]
Merge "Release reference when putting RILRequest back into the pool."
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:49:19 +0000 (17:49 -0800)]
Merge "Prevent system crash when OOM in Binder thread."
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:41:22 +0000 (17:41 -0800)]
Merge "Fix build (broken documentation link)"
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:15:42 +0000 (17:15 -0800)]
Merge "Framebuffer: Support variable number of framebuffers in the UI"
Jean-Baptiste Queru [Thu, 18 Nov 2010 01:03:10 +0000 (17:03 -0800)]
Merge "Reorder lock acquision vs try."
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:10:05 +0000 (15:10 -0800)]
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
Brad Fitzpatrick [Tue, 16 Nov 2010 17:22:31 +0000 (09:22 -0800)]
Merge "DropBox: Read until the end of stream has been reached"
Amith Yamasani [Thu, 11 Nov 2010 16:50:52 +0000 (08:50 -0800)]
Merge "Adding pan behavior on preference dialog."
Brad Fitzpatrick [Wed, 10 Nov 2010 18:58:50 +0000 (10:58 -0800)]
Merge "Without SD card the shutdown sequence was delayed"
Jean-Baptiste Queru [Thu, 4 Nov 2010 14:26:37 +0000 (07:26 -0700)]
Merge "Support changing style parent in overlays"
Rodrigo Obregon [Wed, 3 Nov 2010 20:16:18 +0000 (15:16 -0500)]
Framebuffer: Support variable number of framebuffers in the UI
This change defines a macro NUM_FRAME_BUFFERS to set
the desired number of framebuffers to be used by the UI,
instead of hard-coding 2 framebuffers.
Aditional logic has been added to handle the initialization
and destruction of NUM_FRAME_BUFFERS buffers.
Change-Id: I3a4bfec3e0f453432f2ffebf084c00f574d3be46
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Brad Fitzpatrick [Wed, 3 Nov 2010 18:38:06 +0000 (11:38 -0700)]
Merge "Add support for UAProf header in HTTP requests"
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:16:30 +0000 (10:16 -0700)]
Merge "Fix the animation disappeared issue"
Brad Fitzpatrick [Tue, 2 Nov 2010 21:55:21 +0000 (14:55 -0700)]
Merge "NotificationManager: droiddoc documentation improvements"
Gloria Wang [Tue, 2 Nov 2010 21:45:02 +0000 (14:45 -0700)]
Merge "Update of DRM framework"
Jean-Baptiste Queru [Tue, 2 Nov 2010 20:27:36 +0000 (13:27 -0700)]
Merge "Document per-implementation behaviors of native get* methods"
Jean-Baptiste Queru [Tue, 2 Nov 2010 20:11:56 +0000 (13:11 -0700)]
Merge "Clarify documentation of Cursor get* methods."
Gloria Wang [Tue, 2 Nov 2010 03:38:51 +0000 (20:38 -0700)]
Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled."
Jean-Baptiste Queru [Mon, 1 Nov 2010 20:19:02 +0000 (13:19 -0700)]
Merge "TabWidget orientation"
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:46:36 +0000 (10:46 -0700)]
Merge "Bluetooth OBEX timeout problem."
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:29:22 +0000 (10:29 -0700)]
Merge "Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907)."
Romain Guy [Sun, 31 Oct 2010 18:12:51 +0000 (11:12 -0700)]
Merge "fix typo"
Jean-Baptiste Queru [Mon, 25 Oct 2010 22:32:12 +0000 (15:32 -0700)]
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
Gloria Wang [Mon, 25 Oct 2010 19:23:35 +0000 (12:23 -0700)]
Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback"
Xavier Ducrohet [Fri, 22 Oct 2010 20:28:39 +0000 (13:28 -0700)]
Merge "Make layoutlib use the prebuilt of layoutlib_api"
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:18 +0000 (07:18 -0700)]
Merge "Make the base direction of the Arabic error pages RTL"
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:02 +0000 (07:18 -0700)]
Merge "Set the base direction of the Hebrew error pages to RTL"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:46:52 +0000 (16:46 -0700)]
Merge "Make disabled TextViews uneditable"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:35:17 +0000 (16:35 -0700)]
Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:29:15 +0000 (16:29 -0700)]
Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
Jean-Baptiste Queru [Tue, 19 Oct 2010 21:42:52 +0000 (14:42 -0700)]
Merge "jni: Remove duplicated jniThrowException()"
Joe Onorato [Mon, 11 Oct 2010 22:44:14 +0000 (15:44 -0700)]
Merge "Fix sometimes mExpandedView will appear while screen transforming."
Jean-Baptiste Queru [Mon, 11 Oct 2010 22:11:59 +0000 (15:11 -0700)]
Merge "Fix compile errors in telephony tests"
Jean-Baptiste Queru [Mon, 11 Oct 2010 16:15:50 +0000 (09:15 -0700)]
Merge "Dismissing AlertDialog before destroying WebView."
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:44:00 +0000 (18:44 -0700)]
Merge "Corrected visibility reporting error in WindowManager"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:41:58 +0000 (18:41 -0700)]
Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:32:39 +0000 (18:32 -0700)]
Merge "Telephony: Fix radio state printing"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:20:55 +0000 (18:20 -0700)]
Merge "Fix time zone info in kernel is nothing after reboot"
Jean-Baptiste Queru [Mon, 11 Oct 2010 01:15:17 +0000 (18:15 -0700)]
Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
Jean-Baptiste Queru [Mon, 11 Oct 2010 00:22:11 +0000 (17:22 -0700)]
Merge "Support showing "Cold" battery health."
Jean-Baptiste Queru [Sun, 10 Oct 2010 23:49:54 +0000 (16:49 -0700)]
Merge "Include debugger connection status in error entry"
Brad Fitzpatrick [Sun, 10 Oct 2010 18:15:27 +0000 (11:15 -0700)]
Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"
Jean-Baptiste Queru [Fri, 8 Oct 2010 20:16:18 +0000 (13:16 -0700)]
Merge "NullPointerException at handleMessage(GSMPhone.java)"
Gloria Wang [Thu, 7 Oct 2010 21:40:17 +0000 (14:40 -0700)]
Merge "Update of DRM framework."
Jake Hamby [Sat, 2 Oct 2010 01:04:22 +0000 (18:04 -0700)]
Merge "Add subaddress to SMS fingerprint calculation."
Jake Hamby [Fri, 1 Oct 2010 22:02:32 +0000 (15:02 -0700)]
Merge "Do not explicity disconnect Data during power down for 1x."
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:22:15 +0000 (08:22 -0700)]
Merge "Prevent unhandled exception in NinePatchDrawable"
Jean-Baptiste Queru [Sun, 26 Sep 2010 15:16:26 +0000 (08:16 -0700)]
Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press."
Jean-Baptiste Queru [Tue, 21 Sep 2010 17:09:12 +0000 (10:09 -0700)]
Merge "MOTOYA Japanese fonts"
Romain Guy [Sun, 12 Sep 2010 18:42:49 +0000 (11:42 -0700)]
Merge "fix typo in comment @beamsOverlap"
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:42:48 +0000 (08:42 -0700)]
Merge "Make DRM libraries optional"
Romain Guy [Sat, 11 Sep 2010 21:06:07 +0000 (14:06 -0700)]
Merge "Fix the layouting of the checkbox."
Romain Guy [Sat, 11 Sep 2010 21:03:11 +0000 (14:03 -0700)]
Merge "Memory leak in TextKeyListener."
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:13:13 +0000 (16:13 -0700)]
Merge "Fix number counter will keep going after window losed focus."
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:36:21 +0000 (14:36 -0700)]
Merge "Allow two SurfaceViews inbetween the app and the wallpaper."
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:25:14 +0000 (14:25 -0700)]
Merge "Make sure OutOfMemoryError is handled by WallpaperManager"
Xavier Ducrohet [Fri, 10 Sep 2010 01:30:59 +0000 (18:30 -0700)]
Merge "Avoid pre-processing images when they won't be used"
Jean-Baptiste Queru [Thu, 9 Sep 2010 21:22:50 +0000 (14:22 -0700)]
Merge " Initial contribution from Sony Corporation."
Xavier Ducrohet [Thu, 2 Sep 2010 18:08:03 +0000 (11:08 -0700)]
Merge "Add a --debug-mode option to aapt."
Mike Lockwood [Tue, 31 Aug 2010 20:56:00 +0000 (13:56 -0700)]
Merge "GPS: Initialize XTRA support when GPS is enabled"
Mike Lockwood [Tue, 31 Aug 2010 20:55:39 +0000 (13:55 -0700)]
Merge "GPS: Don't set XTRA download pending flag at boot time."
Jean-Baptiste Queru [Mon, 30 Aug 2010 22:03:06 +0000 (15:03 -0700)]
Merge "Fix a monkey crash when the new WebView is destroyed."
Jean-Baptiste Queru [Mon, 30 Aug 2010 20:00:48 +0000 (13:00 -0700)]
Merge "Telephony: Control operator selection using EF_CSP data."
Jean-Baptiste Queru [Mon, 30 Aug 2010 16:15:42 +0000 (09:15 -0700)]
Merge "Support surrogate pairs when layouting text"
Robert Greenwalt [Mon, 23 Aug 2010 20:54:04 +0000 (13:54 -0700)]
Merge "Add an API to request route to an IPv6 host."
Jean-Baptiste Queru [Mon, 23 Aug 2010 20:24:19 +0000 (13:24 -0700)]
Merge "Crash when powering off."
Jean-Baptiste Queru [Mon, 23 Aug 2010 20:22:00 +0000 (13:22 -0700)]
Merge "Adds the ability to Android to initiate a 2 Digit Call."
Sean McNeil [Wed, 23 Jun 2010 09:00:37 +0000 (16:00 +0700)]
Only monitor recognized uevent devices.
system_server can potentially monitor uevent devices that are
of no use to it. For instance, an accelerometer implementation
as uevents. This would cause the process to be busy when
unnecessary. If a device cannot be classified, don't monitor it.
Change-Id: I489cc453bdce7cb376102cba67a9ea470e13292d
Jean-Baptiste Queru [Fri, 20 Aug 2010 23:21:11 +0000 (16:21 -0700)]
Merge "add new sensor types for handling gyro data and device orientation more efficiently."
Jean-Baptiste Queru [Fri, 20 Aug 2010 22:22:33 +0000 (15:22 -0700)]
Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS."
Jean-Baptiste Queru [Tue, 17 Aug 2010 14:49:54 +0000 (07:49 -0700)]
Merge "Keep track of remaining fd when devices are removed"
Jean-Baptiste Queru [Tue, 17 Aug 2010 14:35:08 +0000 (07:35 -0700)]
Merge "Make the LED colors when charging customizable by the vendor"
Jean-Baptiste Queru [Mon, 16 Aug 2010 19:07:26 +0000 (12:07 -0700)]
Merge "Revert "InputMethodService: Fix ignore case in showInputMethodPickerFromClient""
Jean-Baptiste Queru [Mon, 16 Aug 2010 16:15:17 +0000 (09:15 -0700)]
Merge "bootanimation: Don't open non-existing bootanimation.zip"
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:57:29 +0000 (08:57 -0700)]
Merge "frameworks/base/opengl: Add NULL check"
John Huang [Thu, 12 Aug 2010 17:07:06 +0000 (10:07 -0700)]
Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
Jean-Baptiste Queru [Wed, 11 Aug 2010 17:27:17 +0000 (10:27 -0700)]
Merge "Fix isUsbMassStorageConnected() will always return true"
Jean-Baptiste Queru [Wed, 11 Aug 2010 17:11:14 +0000 (10:11 -0700)]
Merge "frameworks/base: Swap width and height of temporary buffer only with orientation change"
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:55:36 +0000 (09:55 -0700)]
Merge "Fix build on some linux machines"
Jean-Baptiste Queru [Wed, 11 Aug 2010 16:29:03 +0000 (09:29 -0700)]
Merge "SIM toolkit enhancements and bug fixes"
Omprakash Dhyade [Thu, 5 Aug 2010 23:28:37 +0000 (16:28 -0700)]
frameworks/base: Swap width and height of temporary buffer only with
orientation change
Current code swaps the width and height by assuming that aspect
ratio of the buffer width and height will be same as that of the
layout clip width and height. That is not always true.
Change the check to orientation change.
Change-Id: Ie387f3a7369025427484e4173cbde7a08df2b9d7
Kenny Root [Tue, 10 Aug 2010 22:22:13 +0000 (15:22 -0700)]
Merge "Sort the IME list before showing to user"
Naomi Luis [Fri, 23 Apr 2010 01:04:31 +0000 (18:04 -0700)]
frameworks/base/opengl: Add NULL check
Check for the validity of the attrs_list in eglChooseConfig before using
it. This avoids a crash during tests in which the attributes are NULL.
Change-Id: I1c0a46b505ae919e2454cfdce32f8dfc21ead247
Jean-Baptiste Queru [Fri, 30 Jul 2010 18:42:09 +0000 (11:42 -0700)]
Merge "Fix a bug that prevented the creation of EGL shared contexts."
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:44:00 +0000 (10:44 -0700)]
Merge "Cat: Move Stk imlpementation into Cat folder"
Jean-Baptiste Queru [Fri, 30 Jul 2010 17:42:15 +0000 (10:42 -0700)]
Merge "Ccat: Initial CCAT implementation"
Jamie Gennis [Fri, 2 Jul 2010 18:39:12 +0000 (11:39 -0700)]
Fix a bug that prevented the creation of EGL shared contexts.
Change-Id: I6b0ec5ef86abdd4e9083067ba297107cfb094df3
Jean-Baptiste Queru [Thu, 29 Jul 2010 22:01:24 +0000 (15:01 -0700)]
Merge "Replaced /sdcard with Environment.getExternalStorageDirectory()"
Jean-Baptiste Queru [Thu, 29 Jul 2010 21:37:48 +0000 (14:37 -0700)]
Merge "Make hasIccCard return true if RUIM card is present."
Romain Guy [Thu, 29 Jul 2010 21:00:48 +0000 (14:00 -0700)]
Merge "Corrected buffer overflow when parsing /proc/wakelocks"
Romain Guy [Thu, 29 Jul 2010 21:00:02 +0000 (14:00 -0700)]
Merge "Fixed a documentation Bug (Issue 9236)"
Jean-Baptiste Queru [Mon, 26 Jul 2010 17:01:19 +0000 (10:01 -0700)]
Merge "move native services under services/"
Jean-Baptiste Queru [Mon, 26 Jul 2010 16:56:10 +0000 (09:56 -0700)]
Merge "Fix build."
Jean-Baptiste Queru [Sat, 24 Jul 2010 00:35:13 +0000 (17:35 -0700)]
Merge "Enables writing to USIM phonebook (fixes issue 8976)."
Jean-Baptiste Queru [Fri, 23 Jul 2010 22:24:55 +0000 (15:24 -0700)]
Merge "dependent change for "parse instrumentation result bundles" in sdk"
Romain Guy [Fri, 23 Jul 2010 21:05:40 +0000 (14:05 -0700)]
Merge "Remove compilation warnings by removing illegal characters"