Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for infinite loop in RemoteViewsAdapter"

Browse Source
This commit is contained in:
Alan Viverette
2015-04-28 17:10:40 +00:00
committed by Gerrit Code Review
parent 375e21f811 6d06825ad8
commit 6af08c6b76
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/RemoteViewsAdapter.java
View File

@@ -620,7 +620,15 @@ public class RemoteViewsAdapter extends BaseAdapter implements Handler.Callback
// remove based on both its position as well as it's current memory usage, as well // remove based on both its position as well as it's current memory usage, as well
// as whether it was directly requested vs. whether it was preloaded by our caching // as whether it was directly requested vs. whether it was preloaded by our caching
// mechanism. // mechanism.
mIndexRemoteViews.remove(getFarthestPositionFrom(pruneFromPosition, visibleWindow)); int trimIndex = getFarthestPositionFrom(pruneFromPosition, visibleWindow);
// Need to check that this is a valid index, to cover the case where you have only
// a single view in the cache, but it's larger than the max memory limit
if (trimIndex < 0) {
break;
}
mIndexRemoteViews.remove(trimIndex);
} }
// Update the metadata cache // Update the metadata cache