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

Merge "Register native allocation for Font" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-13 22:00:03 +00:00
committed by Android (Google) Code Review
parent e142517c82 44fa7cbf7e
commit 7a063e67e9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/java/android/graphics/fonts/Font.java
View File

@@ -63,6 +63,10 @@ public final class Font {
NativeAllocationRegistry.createMalloced( NativeAllocationRegistry.createMalloced(
ByteBuffer.class.getClassLoader(), nGetReleaseNativeFont()); ByteBuffer.class.getClassLoader(), nGetReleaseNativeFont());
private static final NativeAllocationRegistry FONT_REGISTRY =
NativeAllocationRegistry.createMalloced(Font.class.getClassLoader(),
nGetReleaseNativeFont());
private static final Object SOURCE_ID_LOCK = new Object(); private static final Object SOURCE_ID_LOCK = new Object();
@GuardedBy("SOURCE_ID_LOCK") @GuardedBy("SOURCE_ID_LOCK")
private static final LongSparseLongArray FONT_SOURCE_ID_MAP = private static final LongSparseLongArray FONT_SOURCE_ID_MAP =
@@ -526,11 +530,14 @@ public final class Font {
* Use Builder instead * Use Builder instead
* *
* Caller must increment underlying minikin::Font ref count. * Caller must increment underlying minikin::Font ref count.
* This class takes the ownership of the passing native objects.
* *
* @hide * @hide
*/ */
public Font(long nativePtr) { public Font(long nativePtr) {
mNativePtr = nativePtr; mNativePtr = nativePtr;
FONT_REGISTRY.registerNativeAllocation(this, mNativePtr);
} }
/** /**