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

Commit 5611f587 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Move TypedXml{Parser,Serializer} to modules utils package."

parents 5bb44fe5 e55b8eeb

apct-tests/perftests/core/src/android/util/XmlPerfTest.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import androidx.test.filters.LargeTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.internal.util.HexDump;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;



import org.junit.Rule;

import org.junit.Test;

apex/jobscheduler/service/java/com/android/server/job/JobStore.java

+1 −1
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ import android.util.Pair; 
import android.util.Slog;

import android.util.SparseArray;

import android.util.SystemConfigFileCommitEventLogger;

import android.util.TypedXmlSerializer;

import android.util.Xml;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.BitUtils;

import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.IoThread;

import com.android.server.job.JobSchedulerInternal.JobStorePersistStats;

import com.android.server.job.controllers.JobStatus;

apex/jobscheduler/service/java/com/android/server/tare/Scribe.java

+2 −2
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ import android.util.Pair; 
import android.util.Slog;

import android.util.SparseArray;

import android.util.SparseArrayMap;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.Xml;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,6 @@ import android.util.ArrayMap; 
import android.util.DisplayMetrics;

import android.util.Singleton;

import android.util.Size;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.window.TaskSnapshot;



import com.android.internal.app.LocalePicker;
@@ -92,6 +90,8 @@ import com.android.internal.os.TransferPipe; 
import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.MemInfoReader;

import com.android.internal.util.Preconditions;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;

import com.android.server.LocalServices;



import java.io.FileDescriptor;

core/java/android/app/NotificationChannel.java

+2 −2
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ import android.provider.Settings; 
import android.service.notification.NotificationListenerService;

import android.text.TextUtils;

import android.util.Slog;

import android.util.TypedXmlPullParser;

import android.util.TypedXmlSerializer;

import android.util.proto.ProtoOutputStream;



import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;

import com.android.modules.utils.TypedXmlPullParser;

import com.android.modules.utils.TypedXmlSerializer;



import org.json.JSONException;

import org.json.JSONObject;