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

Merge "Do not deallocate on Bitmap.recycle" into nyc-dev

Browse Source
This commit is contained in:
Diego Perez
2016-03-14 16:39:53 +00:00
committed by Android (Google) Code Review
parent c070a099f5 adf62b3ebc
commit e5155dee85
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/android/graphics/Bitmap_Delegate.java
View File

@@ -67,7 +67,7 @@ public final class Bitmap_Delegate {
// ---- delegate manager ----
private static final DelegateManager<Bitmap_Delegate> sManager =
new DelegateManager<Bitmap_Delegate>(Bitmap_Delegate.class);
new DelegateManager<>(Bitmap_Delegate.class);
private static long sFinalizer = -1;
// ---- delegate helper data ----
@@ -314,7 +314,7 @@ public final class Bitmap_Delegate {
@LayoutlibDelegate
/*package*/ static boolean nativeRecycle(long nativeBitmap) {
sManager.removeJavaReferenceFor(nativeBitmap);
// In our case reycle() is a no-op. We will let the finalizer to dispose the bitmap.
return true;
}