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

Commit 48b86e8f authored by Meng Wang's avatar Meng Wang Committed by Android (Google) Code Review
Browse files

Merge "Do not use hidden API XmlUtils."

parents 3d7d1bdc abe994e6

jarjar-rules-shared.txt

+0 −1
Original line number Diff line number Diff line
@@ -12,4 +12,3 @@ rule com.android.internal.util.Preconditions* com.android.internal.telephony.Pre 
rule com.android.internal.util.State* com.android.internal.telephony.State@1

rule com.android.internal.util.StateMachine* com.android.internal.telephony.StateMachine@1

rule com.android.internal.util.UserIcons* com.android.internal.telephony.UserIcons@1
 
rule com.android.internal.util.XmlUtils* com.android.internal.telephony.XmlUtils@1

src/java/com/android/internal/telephony/SmsUsageMonitor.java

+1 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.internal.telephony;



import android.annotation.UnsupportedAppUsage;

import android.app.AppGlobals;

import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -27,7 +26,6 @@ import android.database.ContentObserver; 
import android.os.Binder;

import android.os.Handler;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.telephony.PhoneNumberUtils;
@@ -36,8 +34,8 @@ import android.telephony.SmsManager; 
import android.util.AtomicFile;

import android.util.Xml;



import com.android.internal.telephony.util.XmlUtils;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

src/java/com/android/internal/telephony/cdma/EriManager.java

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ import android.telephony.Rlog; 
import android.util.Xml;



import com.android.internal.telephony.Phone;

import com.android.internal.util.XmlUtils;



import com.android.internal.telephony.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

src/java/com/android/internal/telephony/test/TestConferenceEventPackageParser.java

+5 −5
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


package com.android.internal.telephony.test;



import android.os.Bundle;

import android.telephony.ims.ImsConferenceState;

import com.android.internal.util.XmlUtils;

import android.util.Log;

import android.util.Xml;



import com.android.internal.telephony.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;



import android.os.Bundle;

import android.util.Log;

import android.util.Xml;



import java.io.IOException;

import java.io.InputStream;

src/java/com/android/internal/telephony/uicc/CarrierTestOverride.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.os.Environment; 
import android.telephony.Rlog;

import android.util.Xml;



import com.android.internal.util.XmlUtils;

import com.android.internal.telephony.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;