Merge "Deprecate CellLocation Classes" (27b33841) · Commits · e / os / android_frameworks_base

api/current.txt

+25 −25

Original line number	Diff line number	Diff line
		@@ -47039,9 +47039,9 @@ package android.telephony {
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR;
		}

		public abstract class CellLocation {
		ctor public CellLocation();
		method public static android.telephony.CellLocation getEmpty();
		@Deprecated public abstract class CellLocation {
		ctor @Deprecated public CellLocation();
		method @Deprecated public static android.telephony.CellLocation getEmpty();
		method @Deprecated public static void requestLocationUpdate();
		}

		@@ -48549,19 +48549,19 @@ package android.telephony {

		package android.telephony.cdma {

		public class CdmaCellLocation extends android.telephony.CellLocation {
		ctor public CdmaCellLocation();
		ctor public CdmaCellLocation(android.os.Bundle);
		method public static double convertQuartSecToDecDegrees(int);
		method public void fillInNotifierBundle(android.os.Bundle);
		method public int getBaseStationId();
		method public int getBaseStationLatitude();
		method public int getBaseStationLongitude();
		method public int getNetworkId();
		method public int getSystemId();
		method public void setCellLocationData(int, int, int);
		method public void setCellLocationData(int, int, int, int, int);
		method public void setStateInvalid();
		@Deprecated public class CdmaCellLocation extends android.telephony.CellLocation {
		ctor @Deprecated public CdmaCellLocation();
		ctor @Deprecated public CdmaCellLocation(android.os.Bundle);
		method @Deprecated public static double convertQuartSecToDecDegrees(int);
		method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
		method @Deprecated public int getBaseStationId();
		method @Deprecated public int getBaseStationLatitude();
		method @Deprecated public int getBaseStationLongitude();
		method @Deprecated public int getNetworkId();
		method @Deprecated public int getSystemId();
		method @Deprecated public void setCellLocationData(int, int, int);
		method @Deprecated public void setCellLocationData(int, int, int, int, int);
		method @Deprecated public void setStateInvalid();
		}

		}
		@@ -48761,15 +48761,15 @@ package android.telephony.euicc {

		package android.telephony.gsm {

		public class GsmCellLocation extends android.telephony.CellLocation {
		ctor public GsmCellLocation();
		ctor public GsmCellLocation(android.os.Bundle);
		method public void fillInNotifierBundle(android.os.Bundle);
		method public int getCid();
		method public int getLac();
		method public int getPsc();
		method public void setLacAndCid(int, int);
		method public void setStateInvalid();
		@Deprecated public class GsmCellLocation extends android.telephony.CellLocation {
		ctor @Deprecated public GsmCellLocation();
		ctor @Deprecated public GsmCellLocation(android.os.Bundle);
		method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
		method @Deprecated public int getCid();
		method @Deprecated public int getLac();
		method @Deprecated public int getPsc();
		method @Deprecated public void setLacAndCid(int, int);
		method @Deprecated public void setStateInvalid();
		}

		@Deprecated public final class SmsManager {

non-updatable-api/current.txt

+25 −25

Original line number	Diff line number	Diff line
		@@ -45207,9 +45207,9 @@ package android.telephony {
		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR;
		}

		public abstract class CellLocation {
		ctor public CellLocation();
		method public static android.telephony.CellLocation getEmpty();
		@Deprecated public abstract class CellLocation {
		ctor @Deprecated public CellLocation();
		method @Deprecated public static android.telephony.CellLocation getEmpty();
		method @Deprecated public static void requestLocationUpdate();
		}

		@@ -46717,19 +46717,19 @@ package android.telephony {

		package android.telephony.cdma {

		public class CdmaCellLocation extends android.telephony.CellLocation {
		ctor public CdmaCellLocation();
		ctor public CdmaCellLocation(android.os.Bundle);
		method public static double convertQuartSecToDecDegrees(int);
		method public void fillInNotifierBundle(android.os.Bundle);
		method public int getBaseStationId();
		method public int getBaseStationLatitude();
		method public int getBaseStationLongitude();
		method public int getNetworkId();
		method public int getSystemId();
		method public void setCellLocationData(int, int, int);
		method public void setCellLocationData(int, int, int, int, int);
		method public void setStateInvalid();
		@Deprecated public class CdmaCellLocation extends android.telephony.CellLocation {
		ctor @Deprecated public CdmaCellLocation();
		ctor @Deprecated public CdmaCellLocation(android.os.Bundle);
		method @Deprecated public static double convertQuartSecToDecDegrees(int);
		method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
		method @Deprecated public int getBaseStationId();
		method @Deprecated public int getBaseStationLatitude();
		method @Deprecated public int getBaseStationLongitude();
		method @Deprecated public int getNetworkId();
		method @Deprecated public int getSystemId();
		method @Deprecated public void setCellLocationData(int, int, int);
		method @Deprecated public void setCellLocationData(int, int, int, int, int);
		method @Deprecated public void setStateInvalid();
		}

		}
		@@ -46929,15 +46929,15 @@ package android.telephony.euicc {

		package android.telephony.gsm {

		public class GsmCellLocation extends android.telephony.CellLocation {
		ctor public GsmCellLocation();
		ctor public GsmCellLocation(android.os.Bundle);
		method public void fillInNotifierBundle(android.os.Bundle);
		method public int getCid();
		method public int getLac();
		method public int getPsc();
		method public void setLacAndCid(int, int);
		method public void setStateInvalid();
		@Deprecated public class GsmCellLocation extends android.telephony.CellLocation {
		ctor @Deprecated public GsmCellLocation();
		ctor @Deprecated public GsmCellLocation(android.os.Bundle);
		method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
		method @Deprecated public int getCid();
		method @Deprecated public int getLac();
		method @Deprecated public int getPsc();
		method @Deprecated public void setLacAndCid(int, int);
		method @Deprecated public void setStateInvalid();
		}

		@Deprecated public final class SmsManager {

telephony/java/android/telephony/CellLocation.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,7 +29,10 @@ import com.android.internal.telephony.PhoneConstants;

		/**
		* Abstract class that represents the location of the device. {@more}
		*
		* @deprecated use {@link android.telephony.CellIdentity CellIdentity}.
		*/
		@Deprecated
		public abstract class CellLocation {

		/**

telephony/java/android/telephony/cdma/CdmaCellLocation.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,7 +23,10 @@ import android.telephony.CellLocation;

		/**
		* Represents the cell location on a CDMA phone.
		*
		* @deprecated use {@link android.telephony.CellIdentity CellIdentity}.
		*/
		@Deprecated
		public class CdmaCellLocation extends CellLocation {
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		private int mBaseStationId = -1;

telephony/java/android/telephony/gsm/GsmCellLocation.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -23,7 +23,10 @@ import android.telephony.CellLocation;

		/**
		* Represents the cell location on a GSM phone.
		*
		* @deprecated use {@link android.telephony.CellIdentity CellIdentity}.
		*/
		@Deprecated
		public class GsmCellLocation extends CellLocation {
		private int mLac;
		private int mCid;