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
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
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
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
Eric Laurent
b5ec7eb39b
Merge "Fix issue 3159946."
2010-12-08 11:05:28 -08:00
Daniel Sandler
fdb423b0a4
Merge "Experimental: Tapping on the status bar sends a space key."
2010-12-08 10:51:03 -08:00
Nick Kralevich
5eee07b132
Merge "Modify emergency number detection"
2010-12-08 10:08:22 -08:00
Teng-Hui Zhu
756af537b2
Merge "Webview listen to Scroll event to update the viewport"
2010-12-08 09:12:10 -08:00
Andreas Huber
180e5d84bf
Merge "Better buffer status management and verification in OMXCodec."
2010-12-08 09:09:25 -08:00
Mathias Agopian
5ec99b57c3
should fix build.
...
Change-Id: I7705227ad123c73714af2ecb7ad84f5432a21c1d
2010-12-07 23:41:55 -08:00
Nick Pelly
4be193fcfe
am 8abce7f5: am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
...
* commit '8abce7f56e4298d3e0035208be48c7afe0e3d2ad':
Implemented getSize() to return max ndef size.
2010-12-07 23:03:52 -08:00
Martijn Coenen
d83973b4d3
am 2f3ed791: am 5289b91c: Implement ndef formatting.
...
* commit '2f3ed7912e852da88efd5ebf9651ba3a89d3c9bd':
Implement ndef formatting.
2010-12-07 23:01:02 -08:00
Wink Saville
950ee6b131
am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
...
* commit 'd9c7fde961dbb78f980be08b9be77b929630c897':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 23:00:56 -08:00
Dianne Hackborn
84e194209c
am c4b7088f: am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
...
* commit 'c4b7088f19f8111ea5f34fba41da4a93899708cd':
Add more checks for bad values to protect from corrupt files.
2010-12-07 23:00:49 -08:00
Mathias Agopian
c9a77126ad
am 4e345ab7: (-s ours) am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
...
* commit '4e345ab7df737592528e99db73612c6b37e34545':
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
2010-12-07 23:00:20 -08:00
Nick Pelly
1f5a356bd1
am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread
...
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
Implemented getSize() to return max ndef size.
2010-12-07 22:57:23 -08:00
Mathias Agopian
222ae987aa
Merge "resolved conflicts for merge of a0f011ff to master"
2010-12-07 22:57:04 -08:00
Nick Pelly
ce561faf57
Merge "Implemented getSize() to return max ndef size." into gingerbread
2010-12-07 22:55:21 -08:00
Mathias Agopian
a1aa18fc26
resolved conflicts for merge of a0f011ff to master
...
Change-Id: I4c17021fc269ce66c98cc345353600eda332f980
2010-12-07 22:53:40 -08:00
Martijn Coenen
8d591a9d1e
am 5289b91c: Implement ndef formatting.
...
* commit '5289b91c885158094988a9a7b51b3139565eb639':
Implement ndef formatting.
2010-12-07 22:35:01 -08:00
Wink Saville
e7bdce57c2
am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
...
* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:22:01 -08:00
Wink Saville
9d6ca87ee1
am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
...
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2010-12-07 22:18:14 -08:00
Dianne Hackborn
759355403e
am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
...
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
Add more checks for bad values to protect from corrupt files.
2010-12-07 22:07:40 -08:00