Merge "Remove Deprecated-At-Birth APIs from PDCS"

This commit is contained in:
Nathan Harold
2020-07-10 16:51:35 +00:00
committed by Android (Google) Code Review
6 changed files with 1 additions and 44 deletions

View File

@@ -180,11 +180,6 @@ package android.telecom {
package android.telephony {
public final class PreciseDataConnectionState implements android.os.Parcelable {
method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
method @Deprecated public int getDataConnectionNetworkType();
}
public class TelephonyManager {
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();

View File

@@ -18839,7 +18839,6 @@ HSPLandroid/telephony/PreciseDataConnectionState;-><init>(Landroid/os/Parcel;)V
HSPLandroid/telephony/PreciseDataConnectionState;-><init>(Landroid/os/Parcel;Landroid/telephony/PreciseDataConnectionState$1;)V
HPLandroid/telephony/PreciseDataConnectionState;->equals(Ljava/lang/Object;)Z
HPLandroid/telephony/PreciseDataConnectionState;->getDataConnectionApn()Ljava/lang/String;
HPLandroid/telephony/PreciseDataConnectionState;->getDataConnectionLinkProperties()Landroid/net/LinkProperties;
HPLandroid/telephony/PreciseDataConnectionState;->getNetworkType()I
HPLandroid/telephony/PreciseDataConnectionState;->getState()I
HSPLandroid/telephony/PreciseDataConnectionState;->toString()Ljava/lang/String;

View File

@@ -165,11 +165,6 @@ package android.telecom {
package android.telephony {
public final class PreciseDataConnectionState implements android.os.Parcelable {
method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
method @Deprecated public int getDataConnectionNetworkType();
}
public class TelephonyManager {
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();

View File

@@ -1707,7 +1707,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
apn = preciseState.getDataConnectionApn();
state = preciseState.getState();
networkType = preciseState.getNetworkType();
linkProps = preciseState.getDataConnectionLinkProperties();
linkProps = preciseState.getLinkProperties();
}
if (VDBG) {
log("notifyDataConnectionForSubscriber: subId=" + subId

View File

@@ -1,11 +1,6 @@
// Signature format: 2.0
package android.telephony {
public final class PreciseDataConnectionState implements android.os.Parcelable {
method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
method @Deprecated public int getDataConnectionNetworkType();
}
public class TelephonyManager {
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();

View File

@@ -166,19 +166,6 @@ public final class PreciseDataConnectionState implements Parcelable {
return mState;
}
/**
* Returns the network type associated with this data connection.
*
* @deprecated use {@link getNetworkType()}
* @hide
* @removed Removed from the R preview SDK but was never part of the stable API surface.
*/
@Deprecated
@SystemApi
public @NetworkType int getDataConnectionNetworkType() {
return mNetworkType;
}
/**
* Returns the network type associated with this data connection.
*
@@ -218,20 +205,6 @@ public final class PreciseDataConnectionState implements Parcelable {
return mApn;
}
/**
* Get the properties of the network link {@link LinkProperties}.
*
* @deprecated use {@link #getLinkProperties()}
* @hide
* @removed Removed from the R preview SDK but was never part of the stable API surface.
*/
@Deprecated
@SystemApi
@Nullable
public LinkProperties getDataConnectionLinkProperties() {
return mLinkProperties;
}
/**
* Get the properties of the network link {@link LinkProperties}.
*/