Wink Saville
bf741e9dfc
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
2010-12-08 21:37:38 -08:00
Wink Saville
b56a7b062d
Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
2010-12-07 21:57:53 -08:00
Jean-Baptiste Queru
d4d1d5a02b
Merge "Strings for NI position request are moved to resources"
2010-12-07 12:01:25 -08:00
Jean-Baptiste Queru
58b879a8f6
Merge "Changing connect and response timeout."
2010-12-06 13:39:19 -08:00
Jean-Baptiste Queru
907333ec69
Merge "NumberPicker: Set formatter local value to US."
2010-12-06 10:57:04 -08:00
Jean-Baptiste Queru
7a039f9994
Merge "Preserve flags field of event passed to injectKeyEvent()"
2010-12-02 14:56:13 -08:00
Jean-Baptiste Queru
6c48212132
Merge "Fix crash by "adb shell pm list permissions -f|-s""
2010-12-01 09:47:14 -08:00
Jean-Baptiste Queru
459ae1107f
Merge "Fix HTTP redirect missing statuscode 303 and 307"
2010-12-01 08:25:12 -08:00
Jean-Baptiste Queru
4e8fa27b4e
Merge "frameworks/base: Destroy the overlay even if there is an error"
2010-11-23 11:02:09 -08:00
Gloria Wang
6772c2d92d
Merge "Notify the playback status to DRM agents before the playback starts"
2010-11-22 21:15:07 -08:00
Gloria Wang
80b7966f1f
Merge "Update of DRM Framework."
2010-11-22 21:14:09 -08:00
Jean-Baptiste Queru
dba567c4ae
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
2010-11-22 15:59:04 -08:00
Naomi Luis
29a73ba845
frameworks/base: Destroy the overlay even if there is an error
...
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
2010-11-22 14:03:18 -08:00
Jean-Baptiste Queru
0fd91dffef
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
2010-11-22 13:40:29 -08:00
Jean-Baptiste Queru
1351c0e488
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
2010-11-19 15:50:29 -08:00
Jean-Baptiste Queru
e656aff671
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
2010-11-19 15:31:30 -08:00
Brad Fitzpatrick
a62be1a99c
Merge "Improve performance when getting styled string."
2010-11-19 07:41:39 -08:00
Jean-Baptiste Queru
487ddf384f
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*"
2010-11-17 18:40:31 -08:00
Jean-Baptiste Queru
db584845a2
Merge "Release reference when putting RILRequest back into the pool."
2010-11-17 17:58:14 -08:00
Jean-Baptiste Queru
15fcb29657
Merge "Prevent system crash when OOM in Binder thread."
2010-11-17 17:49:19 -08:00
Jean-Baptiste Queru
5f17185a76
Merge "Fix build (broken documentation link)"
2010-11-17 17:41:22 -08:00
Jean-Baptiste Queru
90ea001a09
Merge "Framebuffer: Support variable number of framebuffers in the UI"
2010-11-17 17:15:42 -08:00
Jean-Baptiste Queru
a7011da1f7
Merge "Reorder lock acquision vs try."
2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
3bffa0529c
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
2010-11-17 15:10:05 -08:00
Brad Fitzpatrick
4a8dad92bb
Merge "DropBox: Read until the end of stream has been reached"
2010-11-16 09:22:31 -08:00
Amith Yamasani
2d79e36cd1
Merge "Adding pan behavior on preference dialog."
2010-11-11 08:50:52 -08:00
Brad Fitzpatrick
dfa88ec75b
Merge "Without SD card the shutdown sequence was delayed"
2010-11-10 10:58:50 -08:00
Jean-Baptiste Queru
dd1cbdb9f9
Merge "Support changing style parent in overlays"
2010-11-04 07:26:37 -07:00
Rodrigo Obregon
71484f2f76
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>
2010-11-03 15:16:18 -05:00
Brad Fitzpatrick
0e97e9a239
Merge "Add support for UAProf header in HTTP requests"
2010-11-03 11:38:06 -07:00
Jean-Baptiste Queru
5f3c2b79fa
Merge "Fix the animation disappeared issue"
2010-11-03 10:16:30 -07:00
Brad Fitzpatrick
0d4ee6683b
Merge "NotificationManager: droiddoc documentation improvements"
2010-11-02 14:55:21 -07:00
Gloria Wang
b8563353d5
Merge "Update of DRM framework"
2010-11-02 14:45:02 -07:00
Jean-Baptiste Queru
d1089d117e
Merge "Document per-implementation behaviors of native get* methods"
2010-11-02 13:27:36 -07:00
Jean-Baptiste Queru
b664bdce42
Merge "Clarify documentation of Cursor get* methods."
2010-11-02 13:11:56 -07:00
Gloria Wang
1e04f5b26c
Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled."
2010-11-01 20:38:51 -07:00
Jean-Baptiste Queru
86b2b99f9d
Merge "TabWidget orientation"
2010-11-01 13:19:02 -07:00
Jean-Baptiste Queru
d37761cfd9
Merge "Bluetooth OBEX timeout problem."
2010-11-01 10:46:36 -07:00
Jean-Baptiste Queru
24574f1312
Merge "Fixes Issue 7907 in the public bugs database ( http://code.google.com/p/android/issues/detail?id=7907 )."
2010-11-01 10:29:22 -07:00
Romain Guy
a290bb6aba
Merge "fix typo"
2010-10-31 11:12:51 -07:00
Jean-Baptiste Queru
5ed12f734c
Merge "frameworks/base: Handle null from topRunningNonDelayedActivityLocked"
2010-10-25 15:32:12 -07:00
Gloria Wang
5a03d37295
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"
2010-10-25 12:23:35 -07:00
Xavier Ducrohet
68a821e3f1
Merge "Make layoutlib use the prebuilt of layoutlib_api"
2010-10-22 13:28:39 -07:00
Brad Fitzpatrick
3789789c8f
Merge "Make the base direction of the Arabic error pages RTL"
2010-10-21 07:18:18 -07:00
Brad Fitzpatrick
d504db89b9
Merge "Set the base direction of the Hebrew error pages to RTL"
2010-10-21 07:18:02 -07:00
Jean-Baptiste Queru
745d655cad
Merge "Make disabled TextViews uneditable"
2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
333874a009
Merge "BatteryService: Set bool to true if sysfs entry is not 0"
2010-10-20 16:35:17 -07:00
Jean-Baptiste Queru
2be16c5ead
Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
2010-10-20 16:29:15 -07:00
Jean-Baptiste Queru
2387e907c4
Merge "jni: Remove duplicated jniThrowException()"
2010-10-19 14:42:52 -07:00
Joe Onorato
1ad3f53d7c
Merge "Fix sometimes mExpandedView will appear while screen transforming."
2010-10-11 15:44:14 -07:00
