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

Commit a041de78 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix import of Rlog - generated by formatting tool" am: 2b1b1bb2 

Change-Id: I10b31addd35c669432746a2b128fec340d373b49
parents a48e8b71 2b1b1bb2

telephony/java/android/service/carrier/CarrierIdentifier.java

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;

import com.android.telephony.Rlog;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.uicc.IccUtils;

import com.android.telephony.Rlog;



import java.util.Objects;

telephony/java/android/telephony/AnomalyReporter.java

+1 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.telephony;



import com.android.telephony.Rlog;



import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.content.Context;
@@ -27,6 +25,7 @@ import android.content.pm.ResolveInfo; 
import android.os.ParcelUuid;



import com.android.internal.util.IndentingPrintWriter;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;

telephony/java/android/telephony/CbGeoUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 


package android.telephony;



import com.android.telephony.Rlog;



import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.text.TextUtils;



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

import com.android.telephony.Rlog;



import java.util.ArrayList;

import java.util.List;

telephony/java/android/telephony/CellInfoCdma.java

+2 −2
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 


package android.telephony;



import com.android.telephony.Rlog;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;



import com.android.telephony.Rlog;



/**

 * A {@link CellInfo} representing a CDMA cell that provides identity and measurement info.

 */

telephony/java/android/telephony/CellInfoGsm.java

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package android.telephony;



import com.android.telephony.Rlog;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;



import com.android.telephony.Rlog;



/**

 * A {@link CellInfo} representing a GSM cell that provides identity and measurement info.

 */