Jesse Wilson
a460c1871e
Fix a bogus comment on LruCache.hitCount()
...
Change-Id: I219b65bd73b85a414c21d4c4abe59296c9c5945a
2011-03-16 14:57:01 -07:00
Jesse Wilson
2685aa35ff
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
6f31b8c058
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
102930a0de
Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
2011-03-07 23:23:36 -08:00
Romain Guy
f7098ce95d
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
d00353fe31
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
bc8a8e8c92
Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
2011-03-07 22:40:27 -08:00
Mike Lockwood
8b4a4207f6
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
bd3d019cc6
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
823f5bf3db
Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
2011-03-07 20:04:23 -08:00
Santosh Madhava
165c77b9e4
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
5893b453fc
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
0e8dc72db3
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
c87b1101a9
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
43d55c1a6e
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
ff23352ea7
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
b57af72980
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
78b9035b51
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
37e792d53d
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
050b023568
Merge "Support POLICY_FLAG_ALT et. al."
2011-03-07 18:19:09 -08:00
Chet Haase
bead982ff2
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
5f4b02064d
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
79bd55ccb5
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
f018560cb5
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
e5e8e84fe9
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
4bd6ccd251
Merge "Restore save/restore calls removed recently" into honeycomb-mr1
2011-03-07 18:12:34 -08:00
Romain Guy
25b81110b1
Merge "Fix EGL JNI bugs Bug #3461349 " into honeycomb-mr1
2011-03-07 18:11:21 -08:00
Adam Powell
6ac23abf0e
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
cabfcc1364
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
ad542efb8a
Merge "Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector" into honeycomb-mr1
2011-03-07 18:08:11 -08:00
Romain Guy
9b7146db6d
Fix EGL JNI bugs
...
Bug #3461349
Before this change, eglGetCurrent*() could not be used to compare
contexts, displays and surfaces at the Dalvik level.
Change-Id: I442037dae37bc357b64810ab10c779b5754e9153
2011-03-07 18:05:04 -08:00
Wink Saville
b3c991b019
Provide default value for operator numeric for CDMA.
...
If the RIL_REQUEST_OPERATOR response[2], the numeric for the operator,
is bad use the system property ro.cdma.home.operator.numeric.
bug: 3383515
Change-Id: I090e5ba0cb7e3a7f1dc08d24996e78e489b9cd41
2011-03-07 17:52:36 -08:00
Chet Haase
88172fe49c
Restore save/restore calls removed recently
...
Calls thought to be duplicates were removed, which caused rendering problems
for Browser as well as crashes in the widget list and music.
Change-Id: I6364aaa362619ea3dd368990304d61d84bbe2a90
2011-03-07 17:36:33 -08:00
James Dong
2df32f92cf
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
James Dong
d21668768a
Add the default back-facing camera to the MediaProfile camera vector
...
As a result, missing media_profiles.xml will be still allowed.
Change-Id: Ie6c1bbfdfd4e971f1d5d0e031a913e757f3863a7
2011-03-07 17:06:58 -08:00
Jeff Brown
ea025433e2
Support POLICY_FLAG_ALT et. al.
...
Change-Id: If3759d18e380d9f18d6ff30b4295b41cb69f6e0b
2011-03-07 16:54:00 -08:00
Adam Powell
0818020d7c
Fix bug 3506292 - Add guards against bad event streams to ScaleGestureDetector
...
Change-Id: Id38ebb368168b7157369964e39948036405427b1
2011-03-07 16:48:29 -08:00
Wink Saville
26e3e590f9
Merge "Have createAllDataConnectionList create the RetryManager inside the loop."
2011-03-07 16:40:45 -08:00
Wink Saville
a43ae3927b
Have createAllDataConnectionList create the RetryManager inside the loop.
...
Change-Id: Ifd7728f222ba2cac8710f7636c471e441fe2c445
2011-03-07 16:37:10 -08:00
Adam Powell
26555a5437
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
3314a31377
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
5281cc8176
Merge "Make PointerLocationView also log generic motions and some keys."
2011-03-07 16:26:13 -08:00
Adam Powell
a46c1df226
Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1
2011-03-07 16:25:20 -08:00
Chia-chi Yeh
6b70f569ad
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
Chia-chi Yeh
0588f16b56
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
ab7c3245ed
Merge "NEW_API: Unhide RTP APIs." into honeycomb-mr1
2011-03-07 15:39:54 -08:00
Adam Powell
3ba8f5d675
Fix bug 4021346 - crash while navigating
...
Change-Id: Iff60c5f4214c56597f2a1b393982d023866e490e
2011-03-07 15:36:33 -08:00
Adam Powell
81f4fdc1f4
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
Adam Powell
6fd61629b3
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
43a811979d
Merge "Fix bug 3501766 - Make the action bar "up" visual more prominent" into honeycomb-mr1
2011-03-07 15:06:02 -08:00