hotspot2: add support for complete PerProviderSubscription/Policy subtree (01e738a0) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/hotspot2/PasspointConfiguration.java

+14 −5

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package android.net.wifi.hotspot2;

	import android.net.wifi.hotspot2.pps.Credential;		import android.net.wifi.hotspot2.pps.Credential;
	import android.net.wifi.hotspot2.pps.HomeSP;		import android.net.wifi.hotspot2.pps.HomeSP;
			import android.net.wifi.hotspot2.pps.Policy;
	import android.os.Parcelable;		import android.os.Parcelable;
	import android.os.Parcel;		import android.os.Parcel;

	@@ -28,13 +29,12 @@ import android.os.Parcel;
	* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0		* For more info, refer to Hotspot 2.0 PPS MO defined in section 9.1 of the Hotspot 2.0
	* Release 2 Technical Specification.		* Release 2 Technical Specification.
	*		*
	* Currently, only HomeSP and Credential subtrees are supported.
	*
	* @hide		* @hide
	*/		*/
	public final class PasspointConfiguration implements Parcelable {		public final class PasspointConfiguration implements Parcelable {
	public HomeSP homeSp = null;		public HomeSP homeSp = null;
	public Credential credential = null;		public Credential credential = null;
			public Policy policy = null;

	/**		/**
	* Constructor for creating PasspointConfiguration with default values.		* Constructor for creating PasspointConfiguration with default values.
	@@ -54,6 +54,9 @@ public final class PasspointConfiguration implements Parcelable {
	if (source.credential != null) {		if (source.credential != null) {
	credential = new Credential(source.credential);		credential = new Credential(source.credential);
	}		}
			if (source.policy != null) {
			policy = new Policy(source.policy);
			}
	}		}
	}		}

	@@ -66,6 +69,7 @@ public final class PasspointConfiguration implements Parcelable {
	public void writeToParcel(Parcel dest, int flags) {		public void writeToParcel(Parcel dest, int flags) {
	dest.writeParcelable(homeSp, flags);		dest.writeParcelable(homeSp, flags);
	dest.writeParcelable(credential, flags);		dest.writeParcelable(credential, flags);
			dest.writeParcelable(policy, flags);
	}		}

	@Override		@Override
	@@ -77,9 +81,10 @@ public final class PasspointConfiguration implements Parcelable {
	return false;		return false;
	}		}
	PasspointConfiguration that = (PasspointConfiguration) thatObject;		PasspointConfiguration that = (PasspointConfiguration) thatObject;
	return (homeSp == null ? that.homeSp == null : homeSp.equals(that.homeSp)) &&		return (homeSp == null ? that.homeSp == null : homeSp.equals(that.homeSp))
	(credential == null ? that.credential == null :		&& (credential == null ? that.credential == null :
	credential.equals(that.credential));		credential.equals(that.credential))
			&& (policy == null) ? that.policy == null : policy.equals(that.policy);
	}		}

	/**		/**
	@@ -94,6 +99,9 @@ public final class PasspointConfiguration implements Parcelable {
	if (credential == null \|\| !credential.validate()) {		if (credential == null \|\| !credential.validate()) {
	return false;		return false;
	}		}
			if (policy != null && !policy.validate()) {
			return false;
			}
	return true;		return true;
	}		}

	@@ -104,6 +112,7 @@ public final class PasspointConfiguration implements Parcelable {
	PasspointConfiguration config = new PasspointConfiguration();		PasspointConfiguration config = new PasspointConfiguration();
	config.homeSp = in.readParcelable(null);		config.homeSp = in.readParcelable(null);
	config.credential = in.readParcelable(null);		config.credential = in.readParcelable(null);
			config.policy = in.readParcelable(null);
	return config;		return config;
	}		}
	@Override		@Override

wifi/java/android/net/wifi/hotspot2/omadm/PPSMOParser.java

+452 −1

File changed.

Preview size limit exceeded, changes collapsed.

wifi/java/android/net/wifi/hotspot2/pps/Policy.aidl

0 → 100644

+19 −0

Original line number	Original line	Diff line number	Diff line
			/**
			* Copyright (c) 2017, The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package android.net.wifi.hotspot2.pps;

			parcelable Policy;

wifi/java/android/net/wifi/hotspot2/pps/Policy.java

0 → 100644

+452 −0

File added.

Preview size limit exceeded, changes collapsed.

wifi/java/android/net/wifi/hotspot2/pps/UpdateParameter.aidl

0 → 100644

+19 −0

Original line number	Original line	Diff line number	Diff line
			/**
			* Copyright (c) 2017, The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package android.net.wifi.hotspot2.pps;

			parcelable UpdateParameter;