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

Commit f0960b38 authored by Hai Zhang's avatar Hai Zhang
Browse files

Move binary XML into modules-utils. 

Bug: 243194720
Test: presubmit
Change-Id: I5252cf235cedc85aadebbecc078e753b7b54dcdd
parent e55b8eeb

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ java_defaults { 
        "av-types-aidl-java",

        "tv_tuner_resource_manager_aidl_interface-java",

        "soundtrigger_middleware-aidl-java",

        "modules-utils-binary-xml",

        "modules-utils-build",

        "modules-utils-preconditions",

        "modules-utils-statemachine",

apct-tests/perftests/core/src/com/android/internal/util/FastDataPerfTest.java

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ import android.perftests.utils.PerfStatusReporter; 
import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.modules.utils.FastDataInput;

import com.android.modules.utils.FastDataOutput;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

core/java/android/util/CharsetUtils.java

+9 −8
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.util; 


import android.annotation.NonNull;



import com.android.modules.utils.ModifiedUtf8;



import dalvik.annotation.optimization.FastNative;



/**
@@ -30,8 +32,7 @@ import dalvik.annotation.optimization.FastNative; 
 * Callers are cautioned that there is a long-standing ART bug that emits

 * non-standard 4-byte sequences, as described by {@code kUtfUse4ByteSequence}

 * in {@code art/runtime/jni/jni_internal.cc}. If precise modified UTF-8

 * encoding is required, use {@link com.android.internal.util.ModifiedUtf8}

 * instead.

 * encoding is required, use {@link ModifiedUtf8} instead.

 *

 * @hide

 */
@@ -43,8 +44,8 @@ public class CharsetUtils { 
     * Callers are cautioned that there is a long-standing ART bug that emits

     * non-standard 4-byte sequences, as described by

     * {@code kUtfUse4ByteSequence} in {@code art/runtime/jni/jni_internal.cc}.

     * If precise modified UTF-8 encoding is required, use

     * {@link com.android.internal.util.ModifiedUtf8} instead.

     * If precise modified UTF-8 encoding is required, use {@link ModifiedUtf8}

     * instead.

     *

     * @param src string value to be encoded

     * @param dest destination byte array to encode into
@@ -66,8 +67,8 @@ public class CharsetUtils { 
     * Callers are cautioned that there is a long-standing ART bug that emits

     * non-standard 4-byte sequences, as described by

     * {@code kUtfUse4ByteSequence} in {@code art/runtime/jni/jni_internal.cc}.

     * If precise modified UTF-8 encoding is required, use

     * {@link com.android.internal.util.ModifiedUtf8} instead.

     * If precise modified UTF-8 encoding is required, use {@link ModifiedUtf8}

     * instead.

     *

     * @param src string value to be encoded

     * @param srcLen exact length of string to be encoded
@@ -88,8 +89,8 @@ public class CharsetUtils { 
     * Callers are cautioned that there is a long-standing ART bug that emits

     * non-standard 4-byte sequences, as described by

     * {@code kUtfUse4ByteSequence} in {@code art/runtime/jni/jni_internal.cc}.

     * If precise modified UTF-8 encoding is required, use

     * {@link com.android.internal.util.ModifiedUtf8} instead.

     * If precise modified UTF-8 encoding is required, use {@link ModifiedUtf8}

     * instead.

     *

     * @param src source byte array to decode from

     * @param srcOff offset into source where decoding should begin

core/java/android/util/Xml.java

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import android.system.Os; 


import com.android.internal.util.ArtBinaryXmlPullParser;

import com.android.internal.util.ArtBinaryXmlSerializer;

import com.android.internal.util.BinaryXmlSerializer;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.XmlUtils;

import com.android.modules.utils.BinaryXmlSerializer;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

core/java/com/android/internal/util/ArtBinaryXmlPullParser.java

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ package com.android.internal.util; 


import android.annotation.NonNull;



import com.android.modules.utils.BinaryXmlPullParser;

import com.android.modules.utils.FastDataInput;



import java.io.DataInput;

import java.io.InputStream;