Andy McFadden
6fd9624fcd
am e3e8642c: am 001c7d12: Merge "Set capabilities sooner." into gingerbread
2010-10-27 13:28:17 -07:00
Andy McFadden
23cff1cc79
am 001c7d12: Merge "Set capabilities sooner." into gingerbread
2010-10-27 13:25:29 -07:00
Andy McFadden
d2a5a8f3d1
Merge "Set capabilities sooner." into gingerbread
2010-10-27 13:22:50 -07:00
Gil Dobjanschi
43c587a172
Merge "Waveform member variables must be private"
2010-10-27 12:37:34 -07:00
Joe Onorato
c8968ed2c5
Merge "Make the low battery dialog work again."
2010-10-27 12:29:32 -07:00
Joe Onorato
d8f79dcbac
Merge "Move the battery LED code over to the battery service from the notification service (!)"
2010-10-27 12:29:12 -07:00
Steve Block
de9b2dd331
Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack"
2010-10-27 12:29:03 -07:00
Eric Rowe
2919d0c9d4
Merge "Modify bluetooth test cases GB for new HC APIs"
2010-10-27 12:07:44 -07:00
Xavier Ducrohet
77cf116a48
am 57f7ccc4: am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
2010-10-27 11:59:05 -07:00
Yu Shan Emily Lau
c1a04ca925
am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
2010-10-27 11:58:58 -07:00
Steve Block
48429f69d3
Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack"
2010-10-27 11:47:45 -07:00
Xavier Ducrohet
8d3420f18f
am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
2010-10-27 11:23:58 -07:00
Xavier Ducrohet
069ba0b5f2
Merge "Fix issue with project resources overriding framework resources." into gingerbread
2010-10-27 11:22:22 -07:00
Xavier Ducrohet
6d98956e03
Merge "Reimplement the native matrix method using the new delegate way."
2010-10-27 11:18:02 -07:00
Yu Shan Emily Lau
dd5163d241
am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
2010-10-27 11:14:36 -07:00
Yu Shan Emily Lau
4ee95c7a3a
Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
2010-10-27 11:12:58 -07:00
Marco Nelissen
800c7d109e
am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
2010-10-27 11:11:19 -07:00
Marco Nelissen
f391a980ed
am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
2010-10-27 11:08:14 -07:00
Marco Nelissen
7be2f08762
Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread
2010-10-27 11:06:39 -07:00
Amith Yamasani
1d316f647c
Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens."
2010-10-27 11:04:43 -07:00
Andreas Huber
59a2fcac35
Merge "Remove annoying warning during mpeg4 extraction."
2010-10-27 10:58:31 -07:00
Gil Dobjanschi
c362cd8380
Merge "Added waveform data support"
2010-10-27 10:50:28 -07:00
Nick Pelly
31010023e2
am 222f489f: am 6d55e134: Make best effort attempt to recover NFC service when it dies.
2010-10-27 10:46:23 -07:00
Nick Pelly
f85e119944
am 6d55e134: Make best effort attempt to recover NFC service when it dies.
2010-10-27 10:43:19 -07:00
Andreas Huber
239c8d0c46
Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem."
2010-10-27 10:39:57 -07:00
Kristian Monsen
fa52e5ddbb
Merge "Fix for simulator build break"
2010-10-27 10:07:58 -07:00
Iain Merrick
98ab9bb26c
Merge "Only AV formats should be handled by MediaPlayer (Java side)"
2010-10-27 03:31:01 -07:00
Gil Dobjanschi
c73ef39991
Merge "Removed the start and end transition types."
2010-10-26 18:57:57 -07:00
Vasu Nori
252ebf3643
Merge "convert one of the LOGE to LOG_WINDOW msg to reduce grief"
2010-10-26 18:39:27 -07:00
Jack Palevich
8c026c039f
Merge "OpenGL tracing."
2010-10-26 18:37:10 -07:00
Jack Palevich
4e57ba49c6
Merge "Allow a GLSurfaceView to be reattached to a window."
2010-10-26 18:25:56 -07:00
Vasu Nori
a05dd2d15f
Merge "add method in MediaFile to determine if a file is a mediatype of not"
2010-10-26 17:59:03 -07:00
Xavier Ducrohet
75c517cfa2
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors."
2010-10-26 16:56:30 -07:00
Vasu Nori
82bd26d904
convert one of the LOGE to LOG_WINDOW msg to reduce grief
...
grief from people who think this message is bad news.
but in reality, this message is really just an informational message
to aid in debugging
Change-Id: I1a2ab1666a27adb7d3fd210528b2c5218640d53d
2010-10-26 16:44:44 -07:00
Romain Guy
dcaf9fad1c
Merge "Remove unnecessary GL calls."
2010-10-26 16:31:31 -07:00
Andreas Huber
f4bbd9d2c4
am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
2010-10-26 16:25:51 -07:00
Andreas Huber
1f3d9f918d
am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
2010-10-26 16:23:54 -07:00
Andreas Huber
357f918ab6
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
2010-10-26 16:21:48 -07:00
Jason Sams
b84c439e3a
Merge "Begin adding async allocation creation."
2010-10-26 16:16:17 -07:00
Justin Ho
aef34feb3a
am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:10:57 -07:00
Irfan Sheriff
1fa7136549
Merge "WifiLock extensions for high performance mode"
2010-10-26 16:08:29 -07:00
Justin Ho
21ebe2b8ee
am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:08:13 -07:00
Justin Ho
73e5e53a3a
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
2010-10-26 16:06:28 -07:00
Adam Cohen
5843baafb3
Merge "- Made showNext() and showPrevious() on StackView remotable - Made StackView show the transition when showNext() or showPrevious() is called"
2010-10-26 15:51:57 -07:00
Dianne Hackborn
05806a86c8
Merge "ClipDescription no longer inherits from ClipData."
2010-10-26 15:25:18 -07:00
Jack Palevich
a2dd6cf599
OpenGL tracing.
...
Enable with:
adb shell setprop debug.egl.trace 1
Change-Id: Icfbc795f5260141510975228e72234e9aab56a85
2010-10-26 15:21:24 -07:00
Romain Guy
102a47c333
Merge "Enable display lists."
2010-10-26 14:26:15 -07:00
Gloria Wang
1a246b4459
Merge "Do not create drm directory here. Fix for bug 3134576."
2010-10-26 14:16:47 -07:00
Chet Haase
43ae74a93b
Merge "Optimizing ColorFilter in display lists"
2010-10-26 12:53:57 -07:00
Daniel Sandler
ae98ba2728
Merge "Remove logspew."
2010-10-26 12:48:35 -07:00
