Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643 am: 5d8e5249d6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: I3804f270dbe9707ef70e8b6c43675e45fac6c0e6
This commit is contained in:
Nathan Harold
2020-09-30 00:43:03 +00:00
committed by Automerger Merge Worker
parent d715c91c2a 5d8e5249d6
commit febf87fde1
5 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
api/current.txt
View File

@@ -47039,9 +47039,9 @@ package android.telephony {
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR;
} }
public abstract class CellLocation { @Deprecated public abstract class CellLocation {
ctor public CellLocation(); ctor @Deprecated public CellLocation();
method public static android.telephony.CellLocation getEmpty(); method @Deprecated public static android.telephony.CellLocation getEmpty();
method @Deprecated public static void requestLocationUpdate(); method @Deprecated public static void requestLocationUpdate();
} }
@@ -48549,19 +48549,19 @@ package android.telephony {
package android.telephony.cdma { package android.telephony.cdma {
public class CdmaCellLocation extends android.telephony.CellLocation { @Deprecated public class CdmaCellLocation extends android.telephony.CellLocation {
ctor public CdmaCellLocation(); ctor @Deprecated public CdmaCellLocation();
ctor public CdmaCellLocation(android.os.Bundle); ctor @Deprecated public CdmaCellLocation(android.os.Bundle);
method public static double convertQuartSecToDecDegrees(int); method @Deprecated public static double convertQuartSecToDecDegrees(int);
method public void fillInNotifierBundle(android.os.Bundle); method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
method public int getBaseStationId(); method @Deprecated public int getBaseStationId();
method public int getBaseStationLatitude(); method @Deprecated public int getBaseStationLatitude();
method public int getBaseStationLongitude(); method @Deprecated public int getBaseStationLongitude();
method public int getNetworkId(); method @Deprecated public int getNetworkId();
method public int getSystemId(); method @Deprecated public int getSystemId();
method public void setCellLocationData(int, int, int); method @Deprecated public void setCellLocationData(int, int, int);
method public void setCellLocationData(int, int, int, int, int); method @Deprecated public void setCellLocationData(int, int, int, int, int);
method public void setStateInvalid(); method @Deprecated public void setStateInvalid();
} }
} }
@@ -48761,15 +48761,15 @@ package android.telephony.euicc {
package android.telephony.gsm { package android.telephony.gsm {
public class GsmCellLocation extends android.telephony.CellLocation { @Deprecated public class GsmCellLocation extends android.telephony.CellLocation {
ctor public GsmCellLocation(); ctor @Deprecated public GsmCellLocation();
ctor public GsmCellLocation(android.os.Bundle); ctor @Deprecated public GsmCellLocation(android.os.Bundle);
method public void fillInNotifierBundle(android.os.Bundle); method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
method public int getCid(); method @Deprecated public int getCid();
method public int getLac(); method @Deprecated public int getLac();
method public int getPsc(); method @Deprecated public int getPsc();
method public void setLacAndCid(int, int); method @Deprecated public void setLacAndCid(int, int);
method public void setStateInvalid(); method @Deprecated public void setStateInvalid();
} }
@Deprecated public final class SmsManager { @Deprecated public final class SmsManager {

50
non-updatable-api/current.txt
View File

@@ -45207,9 +45207,9 @@ package android.telephony {
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellInfoWcdma> CREATOR;
} }
public abstract class CellLocation { @Deprecated public abstract class CellLocation {
ctor public CellLocation(); ctor @Deprecated public CellLocation();
method public static android.telephony.CellLocation getEmpty(); method @Deprecated public static android.telephony.CellLocation getEmpty();
method @Deprecated public static void requestLocationUpdate(); method @Deprecated public static void requestLocationUpdate();
} }
@@ -46717,19 +46717,19 @@ package android.telephony {
package android.telephony.cdma { package android.telephony.cdma {
public class CdmaCellLocation extends android.telephony.CellLocation { @Deprecated public class CdmaCellLocation extends android.telephony.CellLocation {
ctor public CdmaCellLocation(); ctor @Deprecated public CdmaCellLocation();
ctor public CdmaCellLocation(android.os.Bundle); ctor @Deprecated public CdmaCellLocation(android.os.Bundle);
method public static double convertQuartSecToDecDegrees(int); method @Deprecated public static double convertQuartSecToDecDegrees(int);
method public void fillInNotifierBundle(android.os.Bundle); method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
method public int getBaseStationId(); method @Deprecated public int getBaseStationId();
method public int getBaseStationLatitude(); method @Deprecated public int getBaseStationLatitude();
method public int getBaseStationLongitude(); method @Deprecated public int getBaseStationLongitude();
method public int getNetworkId(); method @Deprecated public int getNetworkId();
method public int getSystemId(); method @Deprecated public int getSystemId();
method public void setCellLocationData(int, int, int); method @Deprecated public void setCellLocationData(int, int, int);
method public void setCellLocationData(int, int, int, int, int); method @Deprecated public void setCellLocationData(int, int, int, int, int);
method public void setStateInvalid(); method @Deprecated public void setStateInvalid();
} }
} }
@@ -46929,15 +46929,15 @@ package android.telephony.euicc {
package android.telephony.gsm { package android.telephony.gsm {
public class GsmCellLocation extends android.telephony.CellLocation { @Deprecated public class GsmCellLocation extends android.telephony.CellLocation {
ctor public GsmCellLocation(); ctor @Deprecated public GsmCellLocation();
ctor public GsmCellLocation(android.os.Bundle); ctor @Deprecated public GsmCellLocation(android.os.Bundle);
method public void fillInNotifierBundle(android.os.Bundle); method @Deprecated public void fillInNotifierBundle(android.os.Bundle);
method public int getCid(); method @Deprecated public int getCid();
method public int getLac(); method @Deprecated public int getLac();
method public int getPsc(); method @Deprecated public int getPsc();
method public void setLacAndCid(int, int); method @Deprecated public void setLacAndCid(int, int);
method public void setStateInvalid(); method @Deprecated public void setStateInvalid();
} }
@Deprecated public final class SmsManager { @Deprecated public final class SmsManager {

3
telephony/java/android/telephony/CellLocation.java
View File

@@ -29,7 +29,10 @@ import com.android.internal.telephony.PhoneConstants;
/** /**
* Abstract class that represents the location of the device. {@more} * Abstract class that represents the location of the device. {@more}
*
* @deprecated use {@link android.telephony.CellIdentity CellIdentity}.
*/ */
@Deprecated
public abstract class CellLocation { public abstract class CellLocation {
/** /**

3
telephony/java/android/telephony/cdma/CdmaCellLocation.java
View File

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

3
telephony/java/android/telephony/gsm/GsmCellLocation.java
View File

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