Eric Laurent
6c8bc690bc
Merge "libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode"
2010-12-09 13:30:07 -08:00
Justin Ho
00e74a5778
Merge "Adding updated HDPI chat stat_notify icon"
2010-12-09 13:29:16 -08:00
Dianne Hackborn
7e28657d56
Merge "Fix issue #3271486 : SetupWizward NullPointerException in"
2010-12-09 13:16:49 -08:00
Christopher Tate
d2c839b7c1
Merge "Add a couple of transport-descriptive methods to IBackupManager"
2010-12-09 13:06:46 -08:00
John Wang
a90ce160ba
Merge "Add iDEN to getNetworkTypeName."
2010-12-09 12:53:01 -08:00
Jason Sams
271e031e14
Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread."
2010-12-09 12:21:19 -08:00
Ben Murdoch
d8132bea02
Merge "Make audio tag cope with live streams"
2010-12-09 11:54:24 -08:00
Amith Yamasani
8b1c68e09e
Merge "Remove the OnItemClick listener when the fragment is destroyed."
2010-12-09 11:45:32 -08:00
Leon Scroggins
3661164663
Merge "Dismiss IME when pressing Next or Previous."
2010-12-09 11:04:06 -08:00
Mindy Pereira
682a426105
Merge "Make sure bottom overscroll feedback takes scrollY into account."
2010-12-09 10:55:39 -08:00
Jean-Baptiste Queru
af401af16e
am 1bec55bd: am d9c17cc1: merge from gingerbread
...
* commit '1bec55bd244f72c65fa254118a72ad3ed10aa845':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:48:54 -08:00
Jean-Baptiste Queru
03e3c1afbd
am d9c17cc1: merge from gingerbread
...
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:45:29 -08:00
Andy Stadler
e6dc0d6c86
Merge "API CHANGE - Add hasGrantedPolicy() API"
2010-12-09 10:05:27 -08:00
Dianne Hackborn
13b18eadd1
Merge "Fix not saving state when restarting an activity."
2010-12-09 09:28:26 -08:00
Jean-Baptiste Queru
062afde24e
merge from gingerbread
...
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
2010-12-09 09:11:06 -08:00
Mike Lockwood
48ca9048e5
Merge "Rehide the PTP content provider interface from the public API."
2010-12-09 08:42:56 -08:00
satok
fe746b7e84
Merge "Change the initial visibility of IME switch button"
2010-12-09 08:10:53 -08:00
Kristian Monsen
d1fc9a8da0
Merge "Make CookieManager.removeSessionCookies async"
2010-12-09 07:26:01 -08:00
Amith Yamasani
f73ae87071
Merge "Move the breadcrumbs to the right pane."
2010-12-09 04:20:04 -08:00
Jason Sams
f8402fa4cf
Merge "Allocation API update."
2010-12-08 23:46:28 -08:00
Wink Saville
03c495a537
am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit 'cc41b92ed7e66cc5d4e14f22b3ea914175d662ec':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 22:00:58 -08:00
Wink Saville
92f18fbd33
am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:57:03 -08:00
Wink Saville
3495638091
am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:53:24 -08:00
Wink Saville
bf741e9dfc
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
2010-12-08 21:37:38 -08:00
Jesse Wilson
ceaf72d375
Merge "Make doclava happy by returning the same type in old and new APIs."
2010-12-08 19:13:34 -08:00
Romain Guy
23a029ada7
Merge "New, better line drawing implementation. Bug #3207544 Bug #3225875 "
2010-12-08 19:10:51 -08:00
Iliyan Malchev
b8ac3fee9f
Merge "service_manager: duplicate registrations override previous ones"
2010-12-08 18:40:43 -08:00
Jeff Brown
275bb2b922
Merge "Fix a regression in clearMetaKeyState."
2010-12-08 18:33:05 -08:00
Jesse Wilson
d74605d276
Merge "Update API with latest parameter names and getClass() return type."
2010-12-08 18:16:42 -08:00
Jeff Brown
1dc0a906ba
Merge "Improve shortcut handling."
2010-12-08 18:15:38 -08:00
Mathias Agopian
5caf3e3e84
Merge "[3211070] camera preview image is rendered offset from the UI overlay frame"
2010-12-08 17:47:04 -08:00
Mathias Agopian
695b66f082
fix build.
...
Change-Id: I49262ac143da297efcaec4eed04052274c73b7f8
2010-12-08 17:44:07 -08:00
Mathias Agopian
f345069099
[3211070] camera preview image is rendered offset from the UI overlay frame
...
somehow this change got lost.
Change-Id: I36f6c7ef3f782918042b77e9dc91a4c811d84a40
2010-12-08 17:40:28 -08:00
Mathias Agopian
0e5484f7d8
Merge "fix [3260137] Sometimes front-facing camera mirroring is wrong"
2010-12-08 17:24:52 -08:00
Mathias Agopian
86bdb2f918
fix [3260137] Sometimes front-facing camera mirroring is wrong
...
make sure to take the buffer's orientation into account.
Change-Id: I9fef89e66368ad2dec1cb8c7b77ac2b3b4858efb
2010-12-08 17:23:18 -08:00
Mathias Agopian
2fa3af5b43
am 054ae782: am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
...
* commit '054ae78245fe9b4c14bbc372ae77cd0a977ded73':
fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
2010-12-08 17:20:39 -08:00
James Dong
06394ed7a4
Merge "resolved conflicts for merge of c402def7 to master"
2010-12-08 17:18:26 -08:00
Mathias Agopian
c5b4c45b58
Merge changes Id4222c9b,I3c1a9172
...
* changes:
More clean-up. Get rid off the "blur" effect in SurfaceFlinger
fix [3259708] Graphic Buffer Mapper does not support YV12
2010-12-08 17:15:54 -08:00
Mike Lockwood
203c26b835
Merge "MTP: Improve argument checking in SendObjectInfo"
2010-12-08 17:15:22 -08:00
James Dong
0e6a975ad2
resolved conflicts for merge of c402def7 to master
...
Change-Id: I328e7c41ad410f07322f6d3a32251e495710c090
2010-12-08 17:14:14 -08:00
Mathias Agopian
1293a8eb56
More clean-up. Get rid off the "blur" effect in SurfaceFlinger
...
For multiple reason, this effect is not maintainable and was never
used due to its abysmal performance. it'll be resurected when it can be
implemented efficiently.
Change-Id: Id4222c9b86c629275cdec18873ef07be8723b6d2
2010-12-08 17:13:19 -08:00
Mathias Agopian
162d046103
am a2c3b355: (-s ours) am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
...
* commit 'a2c3b355877690d889882da3492950d1b2e0e974':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
2010-12-08 16:56:29 -08:00
Romain Guy
d00904ad00
Merge "bug_3259956 and bug_2166704"
2010-12-08 16:50:57 -08:00
Mathias Agopian
0a757814f3
fix [3259708] Graphic Buffer Mapper does not support YV12
...
remove a bunch of a code that was there only to support broken gralloc implementations
Change-Id: I3c1a9172224cbcc283601abfbbd695a20815451f
2010-12-08 16:48:28 -08:00
Mathias Agopian
18c35abd39
am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
...
* commit 'e1752f41d34249c891564889b07963262b1bd8bf':
fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
2010-12-08 16:20:23 -08:00
James Dong
a61fed0c84
am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
...
* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
2010-12-08 16:20:16 -08:00
Mathias Agopian
9215cabfa8
Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
2010-12-08 16:17:02 -08:00
Mathias Agopian
e0be194c7b
am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread
...
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
2010-12-08 16:15:08 -08:00
James Dong
a8e4eb7e51
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
2010-12-08 16:14:27 -08:00
Mathias Agopian
a5529c8778
remove support for PUSH_BUFFER surfaces and overlays
...
the same functionality is now supported through
the h/w composer HAL, and YUV support in the GPU.
Change-Id: I8146605449954b8e8fd7f78810b7d873c2d8f5bf
2010-12-08 16:13:59 -08:00