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

Commit cb1aa8d2 authored Jan 10, 2020 by Meng Wang Committed by Android (Google) Code Review Jan 10, 2020

Merge "Use com.android.telephony.Rlog for mainline module."

parents 106fa497 b8ffe815

telephony/common/android/telephony/LocationAccessPolicy.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.telephony;

		import com.android.telephony.Rlog;

		import android.Manifest;
		import android.annotation.NonNull;
		import android.annotation.Nullable;

telephony/common/com/android/internal/telephony/CarrierAppUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.content.res.Resources;
		import android.os.RemoteException;
		import android.permission.IPermissionManager;
		import android.provider.Settings;
		import android.telephony.Rlog;
		import com.android.telephony.Rlog;
		import android.telephony.TelephonyManager;
		import android.util.ArrayMap;
		import android.util.ArraySet;

telephony/common/com/android/internal/telephony/GsmAlphabet.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.internal.telephony;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.res.Resources;
		import android.os.Build;
		import android.telephony.Rlog;
		import com.android.telephony.Rlog;
		import android.text.TextUtils;
		import android.util.SparseIntArray;

telephony/common/com/android/internal/telephony/HbpcdUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package com.android.internal.telephony;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.database.Cursor;
		import android.telephony.Rlog;
		import com.android.telephony.Rlog;

		import com.android.internal.telephony.HbpcdLookup.ArbitraryMccSidMatch;
		import com.android.internal.telephony.HbpcdLookup.MccIdd;

telephony/common/com/android/internal/telephony/SmsApplication.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ import android.os.UserHandle;
		import android.provider.Telephony;
		import android.provider.Telephony.Sms.Intents;
		import android.telephony.PackageChangeReceiver;
		import android.telephony.Rlog;
		import com.android.telephony.Rlog;
		import android.telephony.TelephonyManager;
		import android.util.Log;