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

Commit 48939fde authored Dec 13, 2019 by Automerger Merge Worker

Merge "Do not use hidden API ArrayUtils" am: 7c582b5d am: a95999b7

Change-Id: If47825d9e8c72b9cb75a5aff3c65fbea011c46c8

parents 460c2478 a95999b7

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import android.text.TextUtils;
		import android.util.LocalLog;
		import android.util.Log;

		import com.android.internal.util.ArrayUtils;
		import com.android.internal.telephony.util.ArrayUtils;
		import com.android.internal.util.IndentingPrintWriter;

		import java.io.FileDescriptor;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ import com.android.internal.telephony.uicc.UiccCardApplication;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.telephony.uicc.UiccProfile;
		import com.android.internal.telephony.uicc.UiccSlot;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.telephony.util.ArrayUtils;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.telephony.util.ArrayUtils;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ import com.android.internal.telephony.uicc.UiccCardApplication;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.telephony.uicc.UiccProfile;
		import com.android.internal.telephony.util.NotificationChannelController;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.telephony.util.ArrayUtils;
		import com.android.internal.util.IndentingPrintWriter;

		import java.io.FileDescriptor;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ import com.android.internal.telephony.uicc.IccUtils;
		import com.android.internal.telephony.uicc.UiccCard;
		import com.android.internal.telephony.uicc.UiccController;
		import com.android.internal.telephony.util.TelephonyUtils;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.telephony.util.ArrayUtils;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;