Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55ffed66 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Expose shared memory related APIs for testing purpose" into sc-dev am: 5774fa63 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13819873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic203608fdfbabd17f6b0a935b3b45a27f9dcb574
parents 318dbd19 5774fa63

core/api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -940,6 +940,12 @@ package android.graphics { 
    method public void splitVertically(@NonNull android.graphics.Rect...);

  }



  public class Typeface {

    method @NonNull public static java.util.Map<java.lang.String,android.graphics.Typeface> deserializeFontMap(@NonNull java.nio.ByteBuffer) throws java.io.IOException;

    method @Nullable public static android.os.SharedMemory getSystemFontMapSharedMemory();

    method @NonNull public static android.os.SharedMemory serializeFontMap(@NonNull java.util.Map<java.lang.String,android.graphics.Typeface>) throws android.system.ErrnoException, java.io.IOException;

  }



}



package android.graphics.drawable {

graphics/java/android/graphics/Typeface.java

+31 −5
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.IntDef; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.annotation.UiThread;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.res.AssetManager;
@@ -168,6 +169,21 @@ public class Typeface { 
    static final Map<String, android.graphics.FontFamily[]> sSystemFallbackMap =

            Collections.emptyMap();



    /**

     * Returns the shared memory that used for creating Typefaces.

     *

     * @return A SharedMemory used for creating Typeface. Maybe null if the lazy initialization is

     *         disabled or inside SystemServer or Zygote.

     * @hide

     */

    @TestApi

    public static @Nullable SharedMemory getSystemFontMapSharedMemory() {

        if (ENABLE_LAZY_TYPEFACE_INITIALIZATION) {

            Objects.requireNonNull(sSystemFontMapSharedMemory);

        }

        return sSystemFontMapSharedMemory;

    }



    /**

     * @hide

     */
@@ -1196,8 +1212,13 @@ public class Typeface { 
        }

    }



    /** @hide */

    public static SharedMemory serializeFontMap(Map<String, Typeface> fontMap)

    /**

     * Create a serialized system font mappings.

     *

     * @hide

     */

    @TestApi

    public static @NonNull SharedMemory serializeFontMap(@NonNull Map<String, Typeface> fontMap)

            throws IOException, ErrnoException {

        long[] nativePtrs = new long[fontMap.size()];

        // The name table will not be large, so let's create a byte array in memory.
@@ -1229,9 +1250,14 @@ public class Typeface { 
    }



    // buffer's byte order should be BIG_ENDIAN.

    /** @hide */

    @VisibleForTesting

    public static Map<String, Typeface> deserializeFontMap(ByteBuffer buffer) throws IOException {

    /**

     * Deserialize the font mapping from the serialized byte buffer.

     *

     * @hide

     */

    @TestApi

    public static @NonNull Map<String, Typeface> deserializeFontMap(@NonNull ByteBuffer buffer)

            throws IOException {

        Map<String, Typeface> fontMap = new ArrayMap<>();

        int typefacesBytesCount = buffer.getInt();

        long[] nativePtrs = nativeReadTypefaces(buffer.slice());