Merge "Remove replaced PreciseDataConnectionState methods from SDK." into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
da50240343
@@ -10883,8 +10883,6 @@ package android.telephony {
|
|||||||
method @Deprecated @NonNull public String getDataConnectionApn();
|
method @Deprecated @NonNull public String getDataConnectionApn();
|
||||||
method @Deprecated public int getDataConnectionApnTypeBitMask();
|
method @Deprecated public int getDataConnectionApnTypeBitMask();
|
||||||
method @Deprecated public int getDataConnectionFailCause();
|
method @Deprecated public int getDataConnectionFailCause();
|
||||||
method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
|
|
||||||
method @Deprecated public int getDataConnectionNetworkType();
|
|
||||||
method @Deprecated public int getDataConnectionState();
|
method @Deprecated public int getDataConnectionState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -180,6 +180,11 @@ package android.telecom {
|
|||||||
|
|
||||||
package android.telephony {
|
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 {
|
public class TelephonyManager {
|
||||||
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
|
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
|
||||||
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();
|
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();
|
||||||
|
|||||||
@@ -394,8 +394,6 @@ package android.telephony {
|
|||||||
method @Deprecated @NonNull public String getDataConnectionApn();
|
method @Deprecated @NonNull public String getDataConnectionApn();
|
||||||
method @Deprecated public int getDataConnectionApnTypeBitMask();
|
method @Deprecated public int getDataConnectionApnTypeBitMask();
|
||||||
method @Deprecated public int getDataConnectionFailCause();
|
method @Deprecated public int getDataConnectionFailCause();
|
||||||
method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();
|
|
||||||
method @Deprecated public int getDataConnectionNetworkType();
|
|
||||||
method @Deprecated public int getDataConnectionState();
|
method @Deprecated public int getDataConnectionState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
// Signature format: 2.0
|
// Signature format: 2.0
|
||||||
package android.telephony {
|
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 {
|
public class TelephonyManager {
|
||||||
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
|
method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();
|
||||||
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();
|
method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ public final class PreciseDataConnectionState implements Parcelable {
|
|||||||
*
|
*
|
||||||
* @deprecated use {@link getNetworkType()}
|
* @deprecated use {@link getNetworkType()}
|
||||||
* @hide
|
* @hide
|
||||||
|
* @removed Removed from the R preview SDK but was never part of the stable API surface.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@SystemApi
|
@SystemApi
|
||||||
@@ -222,6 +223,7 @@ public final class PreciseDataConnectionState implements Parcelable {
|
|||||||
*
|
*
|
||||||
* @deprecated use {@link #getLinkProperties()}
|
* @deprecated use {@link #getLinkProperties()}
|
||||||
* @hide
|
* @hide
|
||||||
|
* @removed Removed from the R preview SDK but was never part of the stable API surface.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@SystemApi
|
@SystemApi
|
||||||
|
|||||||
Reference in New Issue
Block a user