summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "build failed with g++ v. 4.4.5 err msg: ↵Jean-Baptiste Queru2010-11-171-1/+1
|\ | | | | | | 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*"
| * build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
| | | | | | | | | | | | | | 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* Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
* | Merge "Release reference when putting RILRequest back into the pool."Jean-Baptiste Queru2010-11-171-0/+1
|\ \
| * | Release reference when putting RILRequest back into the pool.Johannes Carlsson2010-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to reduce object creation the RILRequest objects are stored in an array when it is unused (max 4). This avoids GC of the object. The object in turn has references to other objects which sometimes hold large memory chunks. This fix releases these references since they are not used anyway. This will make it possible to GC the Message (mResult) which in some cases holds references to a Bitmap which sometimes leads to OutOfMemoryException. The reference is cleared anyway in RILRequest.obtain(...) Change-Id: I3b895bc39b5e2f3ab7cc8297c3583ea78e0ebc77
* | | Merge "Prevent system crash when OOM in Binder thread."Jean-Baptiste Queru2010-11-171-0/+4
|\ \ \
| * | | Prevent system crash when OOM in Binder thread.Mattias Petersson2010-11-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When handling large images during an update of a widget, we can run out of memory in the Binder thread. This will cause an OutOfMemoryError to be thrown. When an Error is thrown in the Binder thread, the entire system will crash. This was fixed by catching this OutOfMemoryError and instead throw a RuntimeException to keep the system alive. Change-Id: If27199676c6f8aef23fb249be1197ca5dfe0fe99
* | | | Merge "Fix build (broken documentation link)"Jean-Baptiste Queru2010-11-171-1/+1
|\ \ \ \
| * | | | Fix build (broken documentation link)Jean-Baptiste Queru2010-11-171-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Ic36f81bbd9f112bd79f9177a407593e8c8f7f0ed
* | | | Merge "Framebuffer: Support variable number of framebuffers in the UI"Jean-Baptiste Queru2010-11-172-20/+28
|\ \ \ \
| * | | | Framebuffer: Support variable number of framebuffers in the UIRodrigo Obregon2010-11-032-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge "Reorder lock acquision vs try."Jean-Baptiste Queru2010-11-171-6/+5
|\ \ \ \ \
| * | | | | Reorder lock acquision vs try.Daniel Trebbien2010-11-011-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In two places involving locking, reordered the code so that the lock acquisition is performed outside of the `try` block and everything else that needs to run while the lock is locked *within* the `try` block. Change-Id: I3dad2c4bbf60b219fc6db2aa35e2ed296cb39128
* | | | | | Merge "Added buildQuery and buildUnionSubQuery methods without misleading ↵Jean-Baptiste Queru2010-11-172-14/+92
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | selectionArgs parameter."
| * | | | | Added buildQuery and buildUnionSubQuery methods without misleading ↵Jonas Schwertfeger2010-11-122-14/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selectionArgs parameter. The signatures of the existing buildQuery and buildUnionSubQuery methods include a selectionArgs parameter that is not actually being used in the method implementations. This parameter leads to the misconception that SQL paramter substitution is carried out by these methods. I added new variants of these methods without that parameter and deprecated the old variants. Change-Id: I1bf770d5c777649e9aac36d93aa93bd65bbcc2a3
* | | | | | Merge "DropBox: Read until the end of stream has been reached"Brad Fitzpatrick2010-11-161-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | DropBox: Read until the end of stream has been reachedChristian Lindeberg2010-11-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read the requested length or until the end of the input stream has actually been reached. Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
* | | | | | Merge "Adding pan behavior on preference dialog."Amith Yamasani2010-11-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding pan behavior on preference dialog.Peter Eliasson2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the preference dialog with text input to pan if the display area is limited. This helps the user to see the input better. Change-Id: I12341546f6f82601ac5a2746153255a9b2d49a1c
* | | | | | Merge "Without SD card the shutdown sequence was delayed"Brad Fitzpatrick2010-11-101-0/+11
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Without SD card the shutdown sequence was delayedJohan Alfven2010-11-091-0/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the memory card is not inserted (or removed) from the phone the shut down process is very long. It takes almost 24 seconds. For the phone with memory card the averige is 5-6 seconds Make sure to send onShutDownComplete even if an SD card is not mounted and no unmount is done. Change-Id: I0e79b82e294a971f5e7144cdd3cc16b7ff414b9c
* | | | | Merge "Support changing style parent in overlays"Jean-Baptiste Queru2010-11-041-14/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Support changing style parent in overlaysMartin Nordholts2010-08-171-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package overlays makes it possible for vendors to tweak the look of the platform and the applications without touching any platform or application code directly. This makes package overlays an important mechanism in the Android build system. There is currently a limitation that forbids changing the parent of a style. If vendors could change the parent of e.g. ‘CalendarTheme’ from Android’s vanilla ‘Theme’ to ‘VendorTheme’, then vendor specific adjustments could be done without changing any code directly. From looking at the code it can be seen that the parent value of a style is stored temporarily in ResourceTable::Entry::mParent while overlays are gone through in buildResources(), and processed (in ResourceTable::Entry::assignResourceIds()) at first after all overlays have been handled, so there aren’t any obvious reasons why changing parent in an overlay should be forbidden. Change-Id: I5969bb8aab90df437e1967fc504cc0da79107d13
* | | | | Merge "Add support for UAProf header in HTTP requests"Brad Fitzpatrick2010-11-032-0/+16
|\ \ \ \ \
| * | | | | Add support for UAProf header in HTTP requestsMatthias Thomae2010-11-022-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each HTTP request sent from a mobile handset is usually required to include a x-wap-profile header following the UAProf specification. The value of this header is a URL that points to the location of a document which specifies relevant capabilities of the phone, e.g. supported network bearers, video formats or screen size. This change defines a global string resource that holds this URL, and also adds the necessary code in the web widget to include this header in HTTP requests.
* | | | | | Merge "Fix the animation disappeared issue"Jean-Baptiste Queru2010-11-031-7/+5
|\ \ \ \ \ \
| * | | | | | Fix the animation disappeared issueChih-Wei Huang2010-11-031-7/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation movie disappears due to the incorrect logic of commit c11f46259a1e8f4e7e58925aefd1ed9eaf57a7fc. Change-Id: I9c0eac2bf2950fe20e931da367036ddf38d81f52
* | | | | | Merge "NotificationManager: droiddoc documentation improvements"Brad Fitzpatrick2010-11-021-11/+14
|\ \ \ \ \ \
| * | | | | | NotificationManager: droiddoc documentation improvementsPeter Collingbourne2010-10-141-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, corrects and improves the overview and the documentation for the NotificationManager.notify(String, int, Notification) method to reflect the fact that the pair (tag, id) is used for notification matching. Change-Id: Ic088a56f457285523d90d296853685393b8c3412
* | | | | | | Merge "Update of DRM framework"Gloria Wang2010-11-0225-566/+374
|\ \ \ \ \ \ \
| * | | | | | | Update of DRM frameworkTakeshi Aimi2010-11-0225-566/+374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Overload openDecryptSession() with uri parameter in order to accept URI of DRM content, Following API is added, DecryptHandle*openDecryptSession(const char* uri);. - Unify texisting three event types of processDrmInfo() so that caller of DRM framework does not have to handle many event types. - Let DrmManagerService call load/unload plugins API so that client of DRM framework does not have to manage plug-in load/unload. - Trivial fix in DrmManagerClient.java is also incorporated. Changes are made by Sony Corporation. Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
* | | | | | | | Merge "Document per-implementation behaviors of native get* methods"Jean-Baptiste Queru2010-11-021-0/+44
|\ \ \ \ \ \ \ \
| * | | | | | | | Document per-implementation behaviors of native get* methodsDaniel Trebbien2010-11-021-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5d20d7796b85ce62750dd50dd79e47d76716b24c
* | | | | | | | | Merge "Clarify documentation of Cursor get* methods."Jean-Baptiste Queru2010-11-021-16/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Clarify documentation of Cursor get* methods.Daniel Trebbien2010-11-021-16/+32
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make clear in the Javadoc comments of the `Cursor` get* methods that implementations thereof can have implementation-defined behavior. In some cases, these changes actually correct the documentation. For example, in the case of `getShort` and the `SQLiteCursor` implementation thereof, non-numeric data is *not* converted to a `short` via Short#valueOf or even in a functionally- equivalent manner. Change-Id: Ib2f81811a603680b52fc482eb9c0f3195447566f
* | | | | | | Merge "- Move the business rule management down to DRM agents. - Do not ↵Gloria Wang2010-11-012-24/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | register DRM sniffer because drmserver is not enabled."
| * | | | | | - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not register DRM sniffer because drmserver is not enabled. Change-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f
* | | | | | Merge "TabWidget orientation"Jean-Baptiste Queru2010-11-012-3/+3
|\ \ \ \ \ \
| * | | | | | TabWidget orientationRoger Olsson2010-10-262-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TabWidget orientation specified in tab_content.xml instead of TabWidget.java. Generally, the orientation of the TabWidget should be set in xml-files and not in TabWidget.java. A sub class of TabActivity may call setContentView() using a custom layout where the TabWidget orientation is vertical. This is the case in the UI Enablers Bottom Tab feature, for landscape display orientation. Change-Id: Ia677441a0af96a8d2ab47ef3298eb440c34924f6
* | | | | | Merge "Bluetooth OBEX timeout problem."Jean-Baptiste Queru2010-11-011-3/+5
|\ \ \ \ \ \
| * | | | | | Bluetooth OBEX timeout problem.Anders Petersson2010-10-271-3/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long time to show notification of file transfer failed after canceling transfer via remote part. Device A is in contact with our device, B. When device A Cancel a transfer operation, it sends OBEX_OPCODE_DISCONNECT HeaderID and the length of package to B. B use the length of package to read remainder bytes from A. If the bytes B read do not meet the received length it will block and wait for remainder bytes from A. But when B compute the remainder bytes it forgets to subtract the three bytes it has already read through HeaderID and the length of the package. So the operation was blocked until the operation timeout. Change-Id: I0f8bf62d3119e081b5c01af9fc05fe586fd4fabc
* | | | | | Merge "Fixes Issue 7907 in the public bugs database ↵Jean-Baptiste Queru2010-11-011-32/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | (http://code.google.com/p/android/issues/detail?id=7907)."
| * | | | | Fixes Issue 7907 in the public bugs database ↵Daniel Trebbien2010-10-311-32/+32
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (http://code.google.com/p/android/issues/detail?id=7907). The Javadoc comment for class `android.content.UriMatcher` had four issues: 1. The example calls to `addURI` should not be using a leading forward slash in the path parameter (reported by Ester Ytterbrink). 2. The sample code to construct a `UriMatcher` was incorrect because the `UriMatcher` constructor takes a parameter (reported by Ross Light). 3. The code example for using `match` was incorrect because it showed two parameters being passed, when `match` only takes one (reported by Ross Light). 4. The sample `getType` implementations were incorrect because `getType` takes a `Uri` object, not an array of `String`s. Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291
* | | | | Merge "fix typo"Romain Guy2010-10-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix typoUwe Voelker2010-10-311-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
* | | | Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"Jean-Baptiste Queru2010-10-251-1/+1
|\ \ \ \
| * | | | frameworks/base: Handle null from topRunningNonDelayedActivityLockedVairavan Srinivasan2010-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startActivityUncheckedLocked tries to move the target task to front when it is not at front. topRunningNonDelayedActivityLocked is used to find the current task, however null value isn't handled. This null causes an unhandled exception leading to the android framework reboot. Change-Id: I2a43cda50483e28a4456846d8b3ccb30d7cf110e
* | | | | Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource ↵Gloria Wang2010-10-2515-41/+826
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | 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"
| * | | | DRM framework support:Gloria Wang2010-10-2515-41/+826
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
* | | | Merge "Make layoutlib use the prebuilt of layoutlib_api"Xavier Ducrohet2010-10-222-2/+2
|\ \ \ \
| * | | | Make layoutlib use the prebuilt of layoutlib_apiXavier Ducrohet2010-10-212-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b
generated by cgit v1.1 at 2025-02-03 23:26:24 +0000