Removing some of the API don't have to be @SystemApi
Some of the API we made @SystemApi won't be used by mainline
module. Removing these from the surface.
Bug: 151266974
Test: atest FrameworksNetTests
atest FrameworksTelephonyTests
atest FrameworksWifiTests
Change-Id: Ie30efa172f93a7557fb6ef56f4daf80e958c3787
This commit is contained in:
@@ -78,6 +78,7 @@ public abstract class NetworkAgent {
|
|||||||
/**
|
/**
|
||||||
* The ID of the {@link NetworkProvider} that created this object, or
|
* The ID of the {@link NetworkProvider} that created this object, or
|
||||||
* {@link NetworkProvider#ID_NONE} if unknown.
|
* {@link NetworkProvider#ID_NONE} if unknown.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
public final int providerId;
|
public final int providerId;
|
||||||
|
|
||||||
@@ -584,6 +585,7 @@ public abstract class NetworkAgent {
|
|||||||
*
|
*
|
||||||
* @deprecated this is for backward compatibility only.
|
* @deprecated this is for backward compatibility only.
|
||||||
* @param legacySubtype the legacy subtype.
|
* @param legacySubtype the legacy subtype.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public void setLegacySubtype(final int legacySubtype, @NonNull final String legacySubtypeName) {
|
public void setLegacySubtype(final int legacySubtype, @NonNull final String legacySubtypeName) {
|
||||||
@@ -608,6 +610,7 @@ public abstract class NetworkAgent {
|
|||||||
*
|
*
|
||||||
* @deprecated this is for backward compatibility only.
|
* @deprecated this is for backward compatibility only.
|
||||||
* @param extraInfo the ExtraInfo.
|
* @param extraInfo the ExtraInfo.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public void setLegacyExtraInfo(@Nullable final String extraInfo) {
|
public void setLegacyExtraInfo(@Nullable final String extraInfo) {
|
||||||
@@ -711,6 +714,7 @@ public abstract class NetworkAgent {
|
|||||||
/**
|
/**
|
||||||
* Called when ConnectivityService request a bandwidth update. The parent factory
|
* Called when ConnectivityService request a bandwidth update. The parent factory
|
||||||
* shall try to overwrite this method and produce a bandwidth update if capable.
|
* shall try to overwrite this method and produce a bandwidth update if capable.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
public void onBandwidthUpdateRequested() {
|
public void onBandwidthUpdateRequested() {
|
||||||
pollLceData();
|
pollLceData();
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ public final class NetworkAgentConfig implements Parcelable {
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return whether the sign in to network notification is enabled by this configuration.
|
* @return whether the sign in to network notification is enabled by this configuration.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
public boolean isProvisioningNotificationEnabled() {
|
public boolean isProvisioningNotificationEnabled() {
|
||||||
return !provisioningNotificationDisabled;
|
return !provisioningNotificationDisabled;
|
||||||
@@ -122,6 +123,7 @@ public final class NetworkAgentConfig implements Parcelable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the subscriber ID, or null if none.
|
* @return the subscriber ID, or null if none.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
public String getSubscriberId() {
|
public String getSubscriberId() {
|
||||||
@@ -138,6 +140,7 @@ public final class NetworkAgentConfig implements Parcelable {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @return whether NAT64 prefix detection is enabled.
|
* @return whether NAT64 prefix detection is enabled.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
public boolean isNat64DetectionEnabled() {
|
public boolean isNat64DetectionEnabled() {
|
||||||
return !skip464xlat;
|
return !skip464xlat;
|
||||||
@@ -247,6 +250,7 @@ public final class NetworkAgentConfig implements Parcelable {
|
|||||||
* Sets the subscriber ID for this network.
|
* Sets the subscriber ID for this network.
|
||||||
*
|
*
|
||||||
* @return this builder, to facilitate chaining.
|
* @return this builder, to facilitate chaining.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
@NonNull
|
@NonNull
|
||||||
public Builder setSubscriberId(@Nullable String subscriberId) {
|
public Builder setSubscriberId(@Nullable String subscriberId) {
|
||||||
@@ -259,6 +263,7 @@ public final class NetworkAgentConfig implements Parcelable {
|
|||||||
* and reduce idle traffic on networks that are known to be IPv6-only without a NAT64.
|
* and reduce idle traffic on networks that are known to be IPv6-only without a NAT64.
|
||||||
*
|
*
|
||||||
* @return this builder, to facilitate chaining.
|
* @return this builder, to facilitate chaining.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
@NonNull
|
@NonNull
|
||||||
public Builder disableNat64Detection() {
|
public Builder disableNat64Detection() {
|
||||||
@@ -271,6 +276,7 @@ public final class NetworkAgentConfig implements Parcelable {
|
|||||||
* perform its own carrier-specific provisioning procedure.
|
* perform its own carrier-specific provisioning procedure.
|
||||||
*
|
*
|
||||||
* @return this builder, to facilitate chaining.
|
* @return this builder, to facilitate chaining.
|
||||||
|
* @hide
|
||||||
*/
|
*/
|
||||||
@NonNull
|
@NonNull
|
||||||
public Builder disableProvisioningNotification() {
|
public Builder disableProvisioningNotification() {
|
||||||
|
|||||||
@@ -613,7 +613,6 @@ public final class NetworkCapabilities implements Parcelable {
|
|||||||
* @return {@code true} if the network should be restricted.
|
* @return {@code true} if the network should be restricted.
|
||||||
* @hide
|
* @hide
|
||||||
*/
|
*/
|
||||||
@SystemApi
|
|
||||||
public boolean deduceRestrictedCapability() {
|
public boolean deduceRestrictedCapability() {
|
||||||
// Check if we have any capability that forces the network to be restricted.
|
// Check if we have any capability that forces the network to be restricted.
|
||||||
final boolean forceRestrictedCapability =
|
final boolean forceRestrictedCapability =
|
||||||
|
|||||||
@@ -106,10 +106,12 @@ public class NetworkProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: consider adding a register() method so ConnectivityManager does not need to call this.
|
// TODO: consider adding a register() method so ConnectivityManager does not need to call this.
|
||||||
|
/** @hide */
|
||||||
public @Nullable Messenger getMessenger() {
|
public @Nullable Messenger getMessenger() {
|
||||||
return mMessenger;
|
return mMessenger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @hide */
|
||||||
public @NonNull String getName() {
|
public @NonNull String getName() {
|
||||||
return mName;
|
return mName;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user