Vasu Nori
fddc45e351
Merge "when printing requery on UI warning, include additional info"
2010-10-08 14:50:59 -07:00
Irfan Sheriff
edeee9ccd1
Merge "Use LinkProperties for IP and proxy configuration"
2010-10-08 14:09:49 -07:00
Adam Powell
33600802b4
Merge "Holo theme progress and assets!"
2010-10-08 13:52:55 -07:00
Mathias Agopian
a1dce610f5
Merge "fix a bug where timeouts would only be handled when a message was delivered"
2010-10-08 13:46:07 -07:00
Joe Onorato
e6db8bcf0c
Merge "Get rid of the global actions menu on tablets."
2010-10-08 13:29:37 -07:00
Jason Chen
68fd208a9e
Merge "Resolved conflicts for merge of 2bd6afed to master"
2010-10-08 13:15:11 -07:00
Mike Lockwood
bb7ecd7ceb
Merge "MTP: Throw a NullPointerException if client is null in MtpCursor constructor"
2010-10-08 13:12:39 -07:00
Jason Chen
e8050e929e
Resolved conflicts for merge of 2bd6afed to master
...
Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9
2010-10-08 13:09:31 -07:00
Elliott Hughes
bea520eb25
Merge "NIOTest fixes."
2010-10-08 12:59:43 -07:00
Jim Miller
799c770e49
Merge "Fix RecentApps to properly load new thumbnails."
2010-10-08 12:53:14 -07:00
Jim Miller
73f83b4e21
Merge "Fix 3061025: Extend wave lockscreen timeout while grabbed."
2010-10-08 12:52:24 -07:00
Mathias Agopian
d2509c8dee
Merge "Fix a null dereference"
2010-10-08 12:44:19 -07:00
Dianne Hackborn
981dd48ebb
am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
...
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'
* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
Fix NPE if there is no accelerometer.
2010-10-08 12:39:14 -07:00
Dianne Hackborn
7ab6d2c3a2
resolved conflicts for merge of efa4f7f8 to master
...
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
2010-10-08 11:09:38 -07:00
Hung-ying Tyan
f98a688419
am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
...
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'
* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
CallManager/SipPhone: fix reject a ringing call
2010-10-08 10:25:50 -07:00
Gilles Debunne
ceb931dcf2
Merge "resolved conflicts for merge of ba04dbc6 to master"
2010-10-08 09:20:57 -07:00
Daniel Sandler
028d06215e
Merge "Start of input method control on system bar."
2010-10-08 08:14:12 -07:00
Shih-wei Liao
6347c28225
Merge "Move rsDebug from rs_math.rsh to rs_core.rsh: rsDebug is more like core functionalities instead of math functionalities. Also portions of rsDebug implementation has been in rs_core.rsh already. Add #define guard for rs_types.rsh to prevent multiple inclusion."
2010-10-08 02:20:13 -07:00
Gilles Debunne
8c2f721639
resolved conflicts for merge of ba04dbc6 to master
...
Change-Id: I175aa21ef01b98b0c3c46aea0b754d14984128b9
2010-10-07 20:46:03 -07:00
Mathias Agopian
954fdd27ca
fix a bug where timeouts would only be handled when a message was delivered
...
Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b
2010-10-07 19:59:06 -07:00
satok
4cb3f43fae
Merge "Show "more" button in the dialog of InputMethodSubtypePicker"
2010-10-07 19:48:43 -07:00
Robert Greenwalt
baa61c7883
Merge "Stop using unauthorized dns"
2010-10-07 18:56:14 -07:00
Brian Carlstrom
6f2b13b1c3
Merge "Move LOG_ALWAYS_FATAL to end of app_process"
2010-10-07 16:32:02 -07:00
Romain Guy
3ca110f2ad
Merge "Add 3D transforms support to all gradients."
2010-10-07 16:20:20 -07:00
Mike Lockwood
e013168cdf
Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty"
2010-10-07 16:15:33 -07:00
Mathias Agopian
58959343db
Fix a null dereference
...
Change-Id: I3df446b90c1607782778749de7ba0f8c00698c33
2010-10-07 14:57:04 -07:00
Gil Dobjanschi
a6eea28f45
Merge "Remove MediaVideoItem and AudioTrack playback APIs."
2010-10-07 14:13:21 -07:00
Andreas Huber
0a49dee588
Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback."
2010-10-07 13:57:08 -07:00
Chet Haase
41947f2a32
Merge "New TimeInterpolator interface for android.animation package."
2010-10-07 13:18:36 -07:00
Eric Laurent
22239a10c5
am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
...
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'
* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
Fixed AudioFlinger not always pausing tracks
2010-10-07 12:23:39 -07:00
Adam Powell
08eff4fce2
am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
...
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'
* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
2010-10-07 12:23:20 -07:00
Adam Powell
33b14f5880
am 65e8b476: am 5a5fff71: Fix bug 3064143 - remove default bold on buttons
...
Merge commit '65e8b476245255a96faaa70872a4196763a95e10'
* commit '65e8b476245255a96faaa70872a4196763a95e10':
Fix bug 3064143 - remove default bold on buttons
2010-10-07 12:22:47 -07:00
Dianne Hackborn
3b4c2bc6ab
am e112b744: am 930d6c3c: Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
...
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'
* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
Fix issue #3056500 : Problem report for ASTRO
2010-10-07 12:22:14 -07:00
Joe Onorato
4c7d73e564
am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
...
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'
* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
PowerManagerService needs yet another flag...
2010-10-07 12:22:03 -07:00
Andreas Huber
a417c7d64c
am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
...
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'
* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
2010-10-07 12:21:33 -07:00
Kenny Root
dea4a5468c
am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
...
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'
* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Jeff Brown
6d462b1221
am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
...
Merge commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7'
* commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7':
Make secure views tolerate IME overlays.
2010-10-07 12:20:45 -07:00
Kenny Root
cafe0c0d52
am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
...
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'
* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
Get correct native library path on reinstall
2010-10-07 12:20:25 -07:00
Dianne Hackborn
f16103c418
am 5d722580: (-s ours) am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
...
Merge commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d'
* commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d':
DO NOT MERGE: Get rid of status bar's dim during night.
2010-10-07 12:20:09 -07:00
Stephen Hines
059f2e5710
Merge "Add RS testing for long and long long."
2010-10-07 11:42:13 -07:00
James Dong
5bb36168c6
Merge "Add two more options to "recordvideo" utility"
2010-10-07 11:00:25 -07:00
Mike Lockwood
130952d1c9
Merge "resolved conflicts for merge of 6327a9fe to master"
2010-10-07 10:57:08 -07:00
Mike Lockwood
e36abb1a90
resolved conflicts for merge of 6327a9fe to master
...
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
2010-10-07 13:55:25 -04:00
Joe Onorato
3db1a4c16f
Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached."
2010-10-07 10:52:30 -07:00
Joe Onorato
5eb1a08163
Merge "Don't crash if there is no phone app and someone presses the phone button."
2010-10-07 10:03:46 -07:00
Robert Greenwalt
57ad4e3106
am b81b89f1: (-s ours) am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
...
Merge commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6'
* commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6':
Add supporting MCC=450(Korea)
2010-10-07 09:25:54 -07:00
James Dong
92833b243f
Merge "0-memcpy video recording framework"
2010-10-07 08:11:26 -07:00
satok
90b05f7bce
Merge "Add InputMethodEnabler for enabling input methods and subtypes"
2010-10-06 22:46:32 -07:00
Romain Guy
d102389f27
Merge "Don't clear the framebuffer when not needed."
2010-10-06 19:51:36 -07:00
Brett Chabot
bb81a558a0
am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread
...
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'
* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
Failing test cleanup.
2010-10-06 17:10:48 -07:00