Merge "Expose sanitizeLocationInfo as SystemApi" (cc2956a0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -8185,30 +8185,37 @@ package android.telephony {

		public abstract class CellIdentity implements android.os.Parcelable {
		method @NonNull public abstract android.telephony.CellLocation asCellLocation();
		method @NonNull public abstract android.telephony.CellIdentity sanitizeLocationInfo();
		}

		public final class CellIdentityCdma extends android.telephony.CellIdentity {
		method @NonNull public android.telephony.cdma.CdmaCellLocation asCellLocation();
		method @NonNull public android.telephony.CellIdentityCdma sanitizeLocationInfo();
		}

		public final class CellIdentityGsm extends android.telephony.CellIdentity {
		method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
		method @NonNull public android.telephony.CellIdentityGsm sanitizeLocationInfo();
		}

		public final class CellIdentityLte extends android.telephony.CellIdentity {
		method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
		method @NonNull public android.telephony.CellIdentityLte sanitizeLocationInfo();
		}

		public final class CellIdentityNr extends android.telephony.CellIdentity {
		method @NonNull public android.telephony.CellLocation asCellLocation();
		method @NonNull public android.telephony.CellIdentityNr sanitizeLocationInfo();
		}

		public final class CellIdentityTdscdma extends android.telephony.CellIdentity {
		method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
		method @NonNull public android.telephony.CellIdentityTdscdma sanitizeLocationInfo();
		}

		public final class CellIdentityWcdma extends android.telephony.CellIdentity {
		method @NonNull public android.telephony.gsm.GsmCellLocation asCellLocation();
		method @NonNull public android.telephony.CellIdentityWcdma sanitizeLocationInfo();
		}

		public final class DataFailCause {

telephony/java/android/telephony/CellIdentity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ public abstract class CellIdentity implements Parcelable {
		*
		* @hide
		*/
		@SystemApi
		public abstract @NonNull CellIdentity sanitizeLocationInfo();

		@Override