LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[FUI09] Expose NetworkStateSnapshot as system API"

Browse Source
This commit is contained in:
Treehugger Robot
2021-03-02 16:08:03 +00:00
committed by Gerrit Code Review
parent 408d00b4ee 51392affe6
commit eb6ee0b29f
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkIdentity.java
View File

@@ -187,8 +187,8 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
// TODO: Delete this function after NetworkPolicyManagerService finishes the migration.
public static NetworkIdentity buildNetworkIdentity(Context context,
NetworkState state, boolean defaultNetwork, @NetworkType int subType) {
final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.linkProperties,
state.networkCapabilities, state.network, state.subscriberId,
final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.network,
state.networkCapabilities, state.linkProperties, state.subscriberId,
state.legacyNetworkType);
return buildNetworkIdentity(context, snapshot, defaultNetwork, subType);
}

51
core/java/android/net/NetworkStateSnapshot.java
View File

@@ -16,8 +16,11 @@
package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -28,31 +31,49 @@ import java.util.Objects;
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
public final class NetworkStateSnapshot implements Parcelable {
@NonNull
public final LinkProperties linkProperties;
@NonNull
public final NetworkCapabilities networkCapabilities;
/** The network associated with this snapshot. */
@NonNull
public final Network network;
/** The {@link NetworkCapabilities} of the network associated with this snapshot. */
@NonNull
public final NetworkCapabilities networkCapabilities;
/** The {@link LinkProperties} of the network associated with this snapshot. */
@NonNull
public final LinkProperties linkProperties;
/**
* The Subscriber Id of the network associated with this snapshot. See
* {@link android.telephony.TelephonyManager#getSubscriberId()}.
*/
@Nullable
public final String subscriberId;
/**
* The legacy type of the network associated with this snapshot. See
* {@code ConnectivityManager#TYPE_*}.
*/
public final int legacyType;
public NetworkStateSnapshot(@NonNull LinkProperties linkProperties,
@NonNull NetworkCapabilities networkCapabilities, @NonNull Network network,
public NetworkStateSnapshot(@NonNull Network network,
@NonNull NetworkCapabilities networkCapabilities,
@NonNull LinkProperties linkProperties,
@Nullable String subscriberId, int legacyType) {
this.linkProperties = Objects.requireNonNull(linkProperties);
this.networkCapabilities = Objects.requireNonNull(networkCapabilities);
this.network = Objects.requireNonNull(network);
this.networkCapabilities = Objects.requireNonNull(networkCapabilities);
this.linkProperties = Objects.requireNonNull(linkProperties);
this.subscriberId = subscriberId;
this.legacyType = legacyType;
}
/** @hide */
public NetworkStateSnapshot(@NonNull Parcel in) {
linkProperties = in.readParcelable(null);
networkCapabilities = in.readParcelable(null);
network = in.readParcelable(null);
networkCapabilities = in.readParcelable(null);
linkProperties = in.readParcelable(null);
subscriberId = in.readString();
legacyType = in.readInt();
}
@@ -64,9 +85,9 @@ public final class NetworkStateSnapshot implements Parcelable {
@Override
public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeParcelable(linkProperties, flags);
out.writeParcelable(networkCapabilities, flags);
out.writeParcelable(network, flags);
out.writeParcelable(networkCapabilities, flags);
out.writeParcelable(linkProperties, flags);
out.writeString(subscriberId);
out.writeInt(legacyType);
}
@@ -93,14 +114,14 @@ public final class NetworkStateSnapshot implements Parcelable {
if (!(o instanceof NetworkStateSnapshot)) return false;
NetworkStateSnapshot that = (NetworkStateSnapshot) o;
return legacyType == that.legacyType
&& Objects.equals(linkProperties, that.linkProperties)
&& Objects.equals(networkCapabilities, that.networkCapabilities)
&& Objects.equals(network, that.network)
&& Objects.equals(networkCapabilities, that.networkCapabilities)
&& Objects.equals(linkProperties, that.linkProperties)
&& Objects.equals(subscriberId, that.subscriberId);
}
@Override
public int hashCode() {
return Objects.hash(linkProperties, networkCapabilities, network, subscriberId, legacyType);
return Objects.hash(network, networkCapabilities, linkProperties, subscriberId, legacyType);
}
}