Merge "RemoteViews: fix BitmapCache after immutable Bitmap switch" into tm-qpr-dev (fe195e6f) · Commits · e / os / android_frameworks_base

core/java/android/widget/RemoteViews.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -1587,7 +1587,13 @@ public class RemoteViews implements Parcelable, Filter {

		public BitmapCache(Parcel source) {
		mBitmaps = source.createTypedArrayList(Bitmap.CREATOR);
		mBitmapHashes = source.readSparseIntArray();
		mBitmapHashes = new SparseIntArray();
		for (int i = 0; i < mBitmaps.size(); i++) {
		Bitmap b = mBitmaps.get(i);
		if (b != null) {
		mBitmapHashes.put(b.hashCode(), i);
		}
		}
		}

		public int getBitmapId(Bitmap b) {
		@@ -1603,7 +1609,7 @@ public class RemoteViews implements Parcelable, Filter {
		b = b.asShared();
		}
		mBitmaps.add(b);
		mBitmapHashes.put(mBitmaps.size() - 1, hash);
		mBitmapHashes.put(hash, mBitmaps.size() - 1);
		mBitmapMemory = -1;
		return (mBitmaps.size() - 1);
		}
		@@ -1620,7 +1626,6 @@ public class RemoteViews implements Parcelable, Filter {

		public void writeBitmapsToParcel(Parcel dest, int flags) {
		dest.writeTypedList(mBitmaps, flags);
		dest.writeSparseIntArray(mBitmapHashes);
		}

		public int getBitmapMemory() {