Merge "Added network objects to ConnectionStatus classes." (57ed8e3f) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -10019,6 +10019,7 @@ package android.net.wifi.sharedconnectivity.app {
		public final class KnownNetworkConnectionStatus implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.os.Bundle getExtras();
		method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetwork getKnownNetwork();
		method public int getStatus();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int CONNECTION_STATUS_SAVED = 1; // 0x1
		@@ -10031,6 +10032,7 @@ package android.net.wifi.sharedconnectivity.app {
		ctor public KnownNetworkConnectionStatus.Builder();
		method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus build();
		method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus.Builder setKnownNetwork(@NonNull android.net.wifi.sharedconnectivity.app.KnownNetwork);
		method @NonNull public android.net.wifi.sharedconnectivity.app.KnownNetworkConnectionStatus.Builder setStatus(int);
		}

		@@ -10099,6 +10101,7 @@ package android.net.wifi.sharedconnectivity.app {
		method public int describeContents();
		method @NonNull public android.os.Bundle getExtras();
		method public int getStatus();
		method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetwork getTetherNetwork();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final int CONNECTION_STATUS_CONNECT_TO_HOTSPOT_FAILED = 9; // 0x9
		field public static final int CONNECTION_STATUS_ENABLING_HOTSPOT = 1; // 0x1
		@@ -10118,6 +10121,7 @@ package android.net.wifi.sharedconnectivity.app {
		method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus build();
		method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus.Builder setStatus(int);
		method @NonNull public android.net.wifi.sharedconnectivity.app.TetherNetworkConnectionStatus.Builder setTetherNetwork(@NonNull android.net.wifi.sharedconnectivity.app.TetherNetwork);
		}

		}

wifi/java/src/android/net/wifi/sharedconnectivity/app/DeviceInfo.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -270,12 +270,22 @@ public final class DeviceInfo implements Parcelable {
		return 0;
		}

		/**
		* Creates a {@link DeviceInfo} object from a parcel.
		*
		* @hide
		*/
		@NonNull
		public static DeviceInfo readFromParcel(@NonNull Parcel in) {
		return new DeviceInfo(in.readInt(), in.readString(), in.readString(), in.readInt(),
		in.readInt());
		}

		@NonNull
		public static final Creator<DeviceInfo> CREATOR = new Creator<DeviceInfo>() {
		@Override
		public DeviceInfo createFromParcel(Parcel in) {
		return new DeviceInfo(in.readInt(), in.readString(), in.readString(), in.readInt(),
		in.readInt());
		return readFromParcel(in);
		}

		@Override

wifi/java/src/android/net/wifi/sharedconnectivity/app/KnownNetwork.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -228,15 +228,25 @@ public final class KnownNetwork implements Parcelable {
		dest.writeInt(mNetworkSource);
		dest.writeString(mSsid);
		dest.writeIntArray(mSecurityTypes);
		dest.writeTypedObject(mDeviceInfo, 0);
		mDeviceInfo.writeToParcel(dest, flags);
		}

		/**
		* Creates a {@link KnownNetwork} object from a parcel.
		*
		* @hide
		*/
		@NonNull
		public static KnownNetwork readFromParcel(@NonNull Parcel in) {
		return new KnownNetwork(in.readInt(), in.readString(), in.createIntArray(),
		DeviceInfo.readFromParcel(in));
		}

		@NonNull
		public static final Creator<KnownNetwork> CREATOR = new Creator<>() {
		@Override
		public KnownNetwork createFromParcel(Parcel in) {
		return new KnownNetwork(in.readInt(), in.readString(), in.createIntArray(),
		in.readTypedObject(DeviceInfo.CREATOR));
		return readFromParcel(in);
		}

		@Override

wifi/java/src/android/net/wifi/sharedconnectivity/app/KnownNetworkConnectionStatus.java

+45 −6

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		public @interface ConnectionStatus {}

		@ConnectionStatus private final int mStatus;
		private final KnownNetwork mKnownNetwork;
		private final Bundle mExtras;

		/**
		@@ -70,6 +71,7 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		*/
		public static final class Builder {
		@ConnectionStatus private int mStatus;
		private KnownNetwork mKnownNetwork;
		private Bundle mExtras;

		public Builder() {}
		@@ -85,6 +87,17 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		return this;
		}

		/**
		* Sets the {@link KnownNetwork} object of the connection.
		*
		* @return Returns the Builder object.
		*/
		@NonNull
		public Builder setKnownNetwork(@NonNull KnownNetwork knownNetwork) {
		mKnownNetwork = knownNetwork;
		return this;
		}

		/**
		* Sets the extras bundle
		*
		@@ -103,12 +116,14 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		*/
		@NonNull
		public KnownNetworkConnectionStatus build() {
		return new KnownNetworkConnectionStatus(mStatus, mExtras);
		return new KnownNetworkConnectionStatus(mStatus, mKnownNetwork, mExtras);
		}
		}

		private KnownNetworkConnectionStatus(@ConnectionStatus int status, Bundle extras) {
		private KnownNetworkConnectionStatus(@ConnectionStatus int status, KnownNetwork knownNetwork,
		Bundle extras) {
		mStatus = status;
		mKnownNetwork = knownNetwork;
		mExtras = extras;
		}

		@@ -122,6 +137,16 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		return mStatus;
		}

		/**
		* Gets the {@link KnownNetwork} object of the connection.
		*
		* @return Returns a KnownNetwork object.
		*/
		@NonNull
		public KnownNetwork getKnownNetwork() {
		return mKnownNetwork;
		}

		/**
		* Gets the extras Bundle.
		*
		@@ -136,12 +161,13 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		public boolean equals(Object obj) {
		if (!(obj instanceof KnownNetworkConnectionStatus)) return false;
		KnownNetworkConnectionStatus other = (KnownNetworkConnectionStatus) obj;
		return mStatus == other.getStatus();
		return mStatus == other.getStatus()
		&& Objects.equals(mKnownNetwork, other.getKnownNetwork());
		}

		@Override
		public int hashCode() {
		return Objects.hash(mStatus);
		return Objects.hash(mStatus, mKnownNetwork);
		}

		@Override
		@@ -152,15 +178,27 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeInt(mStatus);
		mKnownNetwork.writeToParcel(dest, flags);
		dest.writeBundle(mExtras);
		}

		/**
		* Creates a {@link KnownNetworkConnectionStatus} object from a parcel.
		*
		* @hide
		*/
		@NonNull
		public static KnownNetworkConnectionStatus readFromParcel(@NonNull Parcel in) {
		return new KnownNetworkConnectionStatus(in.readInt(),
		KnownNetwork.readFromParcel(in),
		in.readBundle());
		}

		@NonNull
		public static final Creator<KnownNetworkConnectionStatus> CREATOR = new Creator<>() {
		@Override
		public KnownNetworkConnectionStatus createFromParcel(Parcel in) {
		return new KnownNetworkConnectionStatus(in.readInt(),
		in.readBundle(getClass().getClassLoader()));
		return readFromParcel(in);
		}

		@Override
		@@ -173,6 +211,7 @@ public final class KnownNetworkConnectionStatus implements Parcelable {
		public String toString() {
		return new StringBuilder("KnownNetworkConnectionStatus[")
		.append("status=").append(mStatus)
		.append("known network=").append(mKnownNetwork.toString())
		.append("extras=").append(mExtras.toString())
		.append("]").toString();
		}

wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivitySettingsState.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -128,12 +128,22 @@ public final class SharedConnectivitySettingsState implements Parcelable {
		dest.writeBundle(mExtras);
		}

		/**
		* Creates a {@link SharedConnectivitySettingsState} object from a parcel.
		*
		* @hide
		*/
		@NonNull
		public static SharedConnectivitySettingsState readFromParcel(@NonNull Parcel in) {
		return new SharedConnectivitySettingsState(in.readBoolean(),
		in.readBundle());
		}

		@NonNull
		public static final Creator<SharedConnectivitySettingsState> CREATOR = new Creator<>() {
		@Override
		public SharedConnectivitySettingsState createFromParcel(Parcel in) {
		return new SharedConnectivitySettingsState(in.readBoolean(),
		in.readBundle(getClass().getClassLoader()));
		return readFromParcel(in);
		}

		@Override