Commit Graph

14736 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
956ae0d90e Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Jean-Baptiste Queru
56150037c7 Merge "Dismissing AlertDialog before destroying WebView." 2010-10-11 09:15:50 -07:00
Jean-Baptiste Queru
ed5753bb13 Merge "Corrected visibility reporting error in WindowManager" 2010-10-10 18:44:00 -07:00
Jean-Baptiste Queru
5945587a0d Merge "Hold partial wakelock during shutdown to avoid entering sleep" 2010-10-10 18:41:58 -07:00
Jean-Baptiste Queru
a816bd18fc Merge "Telephony: Fix radio state printing" 2010-10-10 18:32:39 -07:00
Jean-Baptiste Queru
dba39be3cb Merge "Fix time zone info in kernel is nothing after reboot" 2010-10-10 18:20:55 -07:00
Jean-Baptiste Queru
e03613e669 Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone" 2010-10-10 18:15:17 -07:00
Jean-Baptiste Queru
2d97f3e590 Merge "Support showing "Cold" battery health." 2010-10-10 17:22:11 -07:00
Jean-Baptiste Queru
0140c05b34 Merge "Include debugger connection status in error entry" 2010-10-10 16:49:54 -07:00
Brad Fitzpatrick
fe80b253ba Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost" 2010-10-10 11:15:27 -07:00
Jean-Baptiste Queru
7d2f049b63 Merge "NullPointerException at handleMessage(GSMPhone.java)" 2010-10-08 13:16:18 -07:00
Gloria Wang
74d354972d Merge "Update of DRM framework." 2010-10-07 14:40:17 -07:00
Jake Hamby
f91f4d912f Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
Jake Hamby
f8bc8a30f2 Merge "Do not explicity disconnect Data during power down for 1x." 2010-10-01 15:02:32 -07:00
Jean-Baptiste Queru
c85a320c2b Merge "Prevent unhandled exception in NinePatchDrawable" 2010-09-26 08:22:15 -07:00
Jean-Baptiste Queru
04fba24b73 Merge "Fix if ACTION_DOWN and lost focus time too close, it will become long press." 2010-09-26 08:16:26 -07:00
Jean-Baptiste Queru
b11c8ae887 Merge "MOTOYA Japanese fonts" 2010-09-21 10:09:12 -07:00
Romain Guy
b6e06d57e5 Merge "fix typo in comment @beamsOverlap" 2010-09-12 11:42:49 -07:00
Jean-Baptiste Queru
2e084394ae Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00
Romain Guy
c3d40e5b94 Merge "Fix the layouting of the checkbox." 2010-09-11 14:06:07 -07:00
Romain Guy
1cca244dfe Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Jean-Baptiste Queru
d7faa10feb Merge "Fix number counter will keep going after window losed focus." 2010-09-10 16:13:13 -07:00
Jean-Baptiste Queru
a859dedd64 Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 2010-09-10 14:36:21 -07:00
Jean-Baptiste Queru
e5cc71dab6 Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 2010-09-10 14:25:14 -07:00
Xavier Ducrohet
41ba2a7c93 Merge "Avoid pre-processing images when they won't be used" 2010-09-09 18:30:59 -07:00
Jean-Baptiste Queru
afdf77bb9c Merge " Initial contribution from Sony Corporation." 2010-09-09 14:22:50 -07:00
Xavier Ducrohet
1a7df62c01 Merge "Add a --debug-mode option to aapt." 2010-09-02 11:08:03 -07:00
Mike Lockwood
2d23eb568a Merge "GPS: Initialize XTRA support when GPS is enabled" 2010-08-31 13:56:00 -07:00
Mike Lockwood
49ff535ed7 Merge "GPS: Don't set XTRA download pending flag at boot time." 2010-08-31 13:55:39 -07:00
Jean-Baptiste Queru
e1afd1f1c4 Merge "Fix a monkey crash when the new WebView is destroyed." 2010-08-30 15:03:06 -07:00
Jean-Baptiste Queru
7cdfe1e440 Merge "Telephony: Control operator selection using EF_CSP data." 2010-08-30 13:00:48 -07:00
Jean-Baptiste Queru
46c9ed2621 Merge "Support surrogate pairs when layouting text" 2010-08-30 09:15:42 -07:00
Robert Greenwalt
209638b621 Merge "Add an API to request route to an IPv6 host." 2010-08-23 13:54:04 -07:00
Jean-Baptiste Queru
a2239f61d2 Merge "Crash when powering off." 2010-08-23 13:24:19 -07:00