Simon Wilson
9f8f474da5
am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
...
* commit '10993b2d1e3614073970aad119ffb2cc9bc8f73f':
mms: mms wap push length check before pdu processing.
2011-03-08 07:58:20 -08:00
James Dong
eb7a2230db
am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit 'b1be086e1d2f15c858b4aa7f40d49667b3e26d3a':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-08 07:58:14 -08:00
Jesse Wilson
8d94af9b5c
am 6f31b8c0: am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
...
* commit '6f31b8c058964ffd87da9f08fc02727bd9415e0b':
Remove deprecated and unused entryEvicted method.
2011-03-07 23:28:54 -08:00
Jesse Wilson
ee784f06fb
am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
...
* commit '102930a0deaf8280a65321de0d6c120a638da9e2':
Remove deprecated and unused entryEvicted method.
2011-03-07 23:25:52 -08:00
Jesse Wilson
77818826b3
Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
2011-03-07 23:23:36 -08:00
Romain Guy
8c5cffc2e5
am d00353fe: am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
...
* commit 'd00353fe3191571a6773ef2d11921cfcff260bc4':
Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:45:52 -08:00
Romain Guy
10955bb8f2
am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
...
* commit 'bc8a8e8c926115cb7b3910d016e5cff12b0f7b0a':
Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:43:02 -08:00
Romain Guy
8a2a2f4689
Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
2011-03-07 22:40:27 -08:00
Mike Lockwood
109d71f4f3
am bd3d019c: am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
...
* commit 'bd3d019cc66237c23ab0658ff80aa7923e84b239':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:08:58 -08:00
Mike Lockwood
be30126455
am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
...
* commit '823f5bf3db8b2f588ae917aaff5d27a65c87f132':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:06:37 -08:00
Mike Lockwood
da921a5e79
Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
2011-03-07 20:04:23 -08:00
Santosh Madhava
21b939802f
am 5893b453: am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
...
* commit '5893b453fc762d18e759a391a442600be4924489':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:47:26 -08:00
Santosh Madhava
dbb597d08b
am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
...
* commit '0e8dc72db34c0a4eb92763de4e048abc4d20f47f':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:45:25 -08:00
Santosh Madhava
7b283bee52
Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
2011-03-07 19:42:16 -08:00
Wink Saville
4ffddc9513
am 43d55c1a: am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit '43d55c1a6ea9f0cd951c197dfdc3917932e316db':
Provide default value for operator numeric for CDMA.
2011-03-07 18:56:42 -08:00
Wink Saville
e0db1feae0
am ff23352e: am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit 'ff23352ea70339c4230d628ab294fbf52159da06':
Provide default value for operator numeric for CDMA.
2011-03-07 18:54:19 -08:00
Wink Saville
3102b5ed0c
am b3c991b0: Provide default value for operator numeric for CDMA.
...
* commit 'b3c991b0190faa4fc833a5fc9074939fd5d8a3c4':
Provide default value for operator numeric for CDMA.
2011-03-07 18:51:57 -08:00
Dianne Hackborn
b8759993d0
am 78b9035b: am 37e792d5: Merge "Fix issue #3515088 : Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
...
* commit '78b9035b51cd5e59500fa242952cb30ee50cddc9':
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
2011-03-07 18:24:04 -08:00
Dianne Hackborn
80b7b4b46b
am 37e792d5: Merge "Fix issue #3515088 : Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1
...
* commit '37e792d53d4b38d1283960d62edcd63ef0a30e5e':
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
2011-03-07 18:21:55 -08:00
Dianne Hackborn
4672f4b772
Merge "Fix issue #3515088 : Don't be so aggressive trying to reclaim memory" into honeycomb-mr1
2011-03-07 18:20:23 -08:00
Jeff Brown
50fb74e466
Merge "Support POLICY_FLAG_ALT et. al."
2011-03-07 18:19:09 -08:00
Chet Haase
aff4078b5c
am 79bd55cc: am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
...
* commit '79bd55ccb55e85b39a8d0c867add56021cd608e2':
Restore save/restore calls removed recently
2011-03-07 18:18:21 -08:00
Romain Guy
6945106524
am f018560c: am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
...
* commit 'f018560cb57e47c3e4bc542e4c596c4d3be3d4c4':
Fix EGL JNI bugs Bug #3461349
2011-03-07 18:16:05 -08:00
Chet Haase
bcca40b327
am 4bd6ccd2: Merge "Restore save/restore calls removed recently" into honeycomb-mr1
...
* commit '4bd6ccd25162a7634a90cfde72dcdc7d581d9a88':
Restore save/restore calls removed recently
2011-03-07 18:15:34 -08:00
Romain Guy
14ed074dfe
am 25b81110: Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
...
* commit '25b81110b1a4d8882727ebdb8aef523f108b53fd':
Fix EGL JNI bugs Bug #3461349
2011-03-07 18:13:27 -08:00
Adam Powell
9a2f8c1054
am 6ac23abf: am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
...
* commit '6ac23abf0e3978e6995981810ddc01812a235387':
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:12:35 -08:00
Chet Haase
d635f04669
Merge "Restore save/restore calls removed recently" into honeycomb-mr1
2011-03-07 18:12:34 -08:00
Romain Guy
5d4d8bed34
Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
2011-03-07 18:11:21 -08:00
Adam Powell
5e3f918be7
am ad542efb: Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
...
* commit 'ad542efb8aa241d3e576d9567f5b0979355037b3':
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
2011-03-07 18:10:13 -08:00
Romain Guy
9fb2277f39
Add support for partial invalidates in WebView
...
Bug #3461349
This change also fixes two bugs that prevented partial invalidates
from working with other views. Both bugs were in our EGL implementation:
they were preventing the caller from comparing the current context/surface
with another context/surface. This was causing HardwareRenderer to always
redraw the entire screen.
Change-Id: I33e096b304d4a0b7e6c8f92930f71d2ece9bebf5
2011-03-07 18:09:03 -08:00
Adam Powell
dc0ad7c01e
Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
2011-03-07 18:08:11 -08:00
Mathias Agopian
5f1e78d730
am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
...
* commit 'df6410dce3dae0bdb7e13118b3878079a1dcce03':
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-07 18:04:06 -08:00
Mathias Agopian
f4e1ef0794
Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
2011-03-07 18:00:20 -08:00
James Dong
2cc930bd40
Merge "Add the default back-facing camera to the MediaProfile camera vector As a result, missing media_profiles.xml will be still allowed."
2011-03-07 17:24:02 -08:00
Mathias Agopian
ee65ac8a71
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
...
37c2a37 fix [3408713] Dialog window invisible sometimes
d35c666 fix [3385504] Surface flinger hang when adding dim surface
1723b04 fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
1b0114f fix a surface leak in SurfaceFlinger
Bug: 3513017
Change-Id: Ia13ed8c9cdcb1f484e177cdcaff687e7c88a10c3
2011-03-07 16:56:16 -08:00
Wink Saville
5568d10c63
Merge "Have createAllDataConnectionList create the RetryManager inside the loop."
2011-03-07 16:40:45 -08:00
Adam Powell
beb0afd885
am 3314a313: am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
...
* commit '3314a31377e60ee11335cc51a2e3dba86b36bb7e':
Fix bug 4021346 - crash while navigating
2011-03-07 16:30:33 -08:00
Adam Powell
08d0a42e4f
am a46c1df2: Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
...
* commit 'a46c1df226f2aea54d3bb068b0537c9b1d28590c':
Fix bug 4021346 - crash while navigating
2011-03-07 16:27:36 -08:00
Jeff Brown
8163b31972
Merge "Make PointerLocationView also log generic motions and some keys."
2011-03-07 16:26:13 -08:00
Adam Powell
5487a1eeef
Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
2011-03-07 16:25:20 -08:00
Chia-chi Yeh
fff566cdb9
am 0588f16b: am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
...
* commit '0588f16b5699f24f4524a3c308bf32feb3be29c9':
NEW_API: Unhide RTP APIs.
2011-03-07 15:44:35 -08:00
Simon Wilson
cc06cc07bd
am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
...
* commit '6b6869d5c1a203e79dc272f2f0e53c184f44f24a':
mms: mms wap push length check before pdu processing.
2011-03-07 15:42:59 -08:00
Chia-chi Yeh
110603b2c2
am ab7c3245: Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
...
* commit 'ab7c3245ed7a725406a58826382471105c725468':
NEW_API: Unhide RTP APIs.
2011-03-07 15:41:50 -08:00
Chia-chi Yeh
8b5a2265fe
Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
2011-03-07 15:39:54 -08:00
Simon Wilson
8cb531d3c9
Merge "mms: mms wap push length check before pdu processing." into gingerbread
2011-03-07 15:39:19 -08:00
Adam Powell
dec59e2b67
am 6fd61629: am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
...
* commit '6fd61629b34881bf5c454ca4aaa7dacfe1656679':
Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:11:54 -08:00
James Dong
5d64c1394a
am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit 'd581c04722e2610ca5471b9c3d1881043b1205b1':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-07 15:10:26 -08:00
Adam Powell
bdc2be5440
am 43a81197: Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
...
* commit '43a811979d55587e014134f6050dc90ca918f9ce':
Fix bug 3501766 - Make the action bar "up" visual more prominent
2011-03-07 15:09:28 -08:00
Adam Powell
6ac14a6ed9
Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
2011-03-07 15:06:02 -08:00
James Dong
1010c71709
am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
...
* commit 'a7c9dffdb8097105482ce976ba0a51baa76d8806':
Add missing copyright headers to a couple of files
2011-03-07 14:45:51 -08:00