Commit Graph

25118 Commits

Author SHA1 Message Date
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
Joe Onorato
4eaf95afa4 Merge "make the wifi button go where it's supposed to." 2010-12-08 15:51:33 -08:00
Joe Onorato
67fd555a50 Merge "Make the ToggleSlider in the status bar settings panel show the right track when it's disabled." 2010-12-08 15:51:27 -08:00
Joe Onorato
737f5130ce Merge "Make setDrawable work after initialization has occurred." 2010-12-08 15:50:52 -08:00
Dianne Hackborn
9d905ed26f Merge "Fix issues #3257701 and #3267312" 2010-12-08 15:49:04 -08:00
Erik Gilling
1d21a9cafc surfaceflinger: add support for gralloc dump hooks
Change-Id: Ib6f539ed0132b70d040d653c03d52cc04249ac3c
2010-12-08 15:40:11 -08:00
Mathias Agopian
c3ce880972 fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.

Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
2010-12-08 15:34:02 -08:00
Winson Chung
db4fdaaa1e Merge "Modified GridView to report when to small" 2010-12-08 15:14:37 -08:00
Mathias Agopian
fc84e8269b Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread 2010-12-08 15:08:33 -08:00
Romain Guy
a9c2fee08d Merge "Re-enable fades in ListView." 2010-12-08 15:08:20 -08:00
Justin Ho
a3a99d296e Merge "Integrating updated alert sounds, and new audio manifest for trygon" 2010-12-08 14:55:00 -08:00
Andreas Huber
3c6fed8c2c Merge "Fix thumbnail extraction for extractors that don't have a preference." 2010-12-08 14:52:11 -08:00
Kenny Root
a15e3f5a92 Merge "Change assets to use 64-bit API" 2010-12-08 14:46:22 -08:00
Carl Shapiro
44cdb6a3eb Merge "Add a comment regarding the sizing of the Dalvik heap." 2010-12-08 14:09:32 -08:00
Brad Fitzpatrick
93687e4f93 am 5f8524d4: am 36af7943: Fix malformed Javadoc.
* commit '5f8524d446fb217516eebafe5d347005051891d1':
  Fix malformed Javadoc.
2010-12-08 13:30:25 -08:00
Brad Fitzpatrick
638ea56494 am 36af7943: Fix malformed Javadoc.
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
2010-12-08 13:23:03 -08:00
Romain Guy
4c9421488b Merge "Fallback to software rendering when eglMakeCurrent fails. Bug #3200621" 2010-12-08 11:49:41 -08:00
Svetoslav Ganov
811be91174 Merge "bug 3248277 android.webkit.AccessibilityInjectorTest tests are flaky on trygon" 2010-12-08 11:39:13 -08:00
Dianne Hackborn
7bcef48fca Merge "Rework activity lifecycle so onSaveInstanceState() is after onPause()." 2010-12-08 11:25:25 -08:00
Kenny Root
18092ddc86 Change assets to use 64-bit API
The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.

There is a new utils/Compat.h added for Mac OS compatibility.

Also fixed some size-related compiler warnings.

Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e
2010-12-08 11:21:30 -08:00
Eric Rowe
ff9e8af9eb Merge "Allow extra flags to be fired in BT stress tests" 2010-12-08 11:11:48 -08:00