Merge "remove passpoint - DO NOT MERGE" into lmp-dev (7aea15a0) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,6 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ISub.aidl \
		telephony/java/com/android/internal/telephony/IMms.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		wifi/java/android/net/wifi/IWifiScanner.aidl \
		wifi/java/android/net/wifi/IRttManager.aidl \

api/current.txt

+0 −180

Original line number	Diff line number	Diff line
		@@ -17994,7 +17994,6 @@ package android.net.wifi {
		field public java.lang.String capabilities;
		field public int frequency;
		field public int level;
		field public android.net.wifi.passpoint.WifiPasspointInfo passpoint;
		field public long timestamp;
		}

		@@ -18473,185 +18472,6 @@ package android.net.wifi.p2p.nsd {

		}

		package android.net.wifi.passpoint {

		public abstract interface IWifiPasspointManager implements android.os.IInterface {
		method public abstract android.os.Messenger getMessenger() throws android.os.RemoteException;
		method public abstract int getPasspointState() throws android.os.RemoteException;
		}

		public class WifiPasspointInfo implements android.os.Parcelable {
		ctor public WifiPasspointInfo();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ANQP_CAPABILITY = 1; // 0x1
		field public static final int CELLULAR_NETWORK = 64; // 0x40
		field public static final int CONNECTION_CAPABILITY = 2048; // 0x800
		field public static final int DOMAIN_NAME = 128; // 0x80
		field public static final int HOTSPOT_CAPABILITY = 256; // 0x100
		field public static final int IP_ADDR_TYPE_AVAILABILITY = 16; // 0x10
		field public static final int NAI_REALM = 32; // 0x20
		field public static final int NETWORK_AUTH_TYPE = 4; // 0x4
		field public static final int OPERATOR_FRIENDLY_NAME = 512; // 0x200
		field public static final int OSU_PROVIDER = 4096; // 0x1000
		field public static final int PRESET_ALL = 8191; // 0x1fff
		field public static final int PRESET_CRED_MATCH = 481; // 0x1e1
		field public static final int ROAMING_CONSORTIUM = 8; // 0x8
		field public static final int VENUE_NAME = 2; // 0x2
		field public static final int WAN_METRICS = 1024; // 0x400
		field public java.lang.String bssid;
		field public java.util.List cellularNetworkList;
		field public java.util.List connectionCapabilityList;
		field public java.util.List domainNameList;
		field public android.net.wifi.passpoint.WifiPasspointInfo.IpAddressType ipAddrTypeAvailability;
		field public java.util.List naiRealmList;
		field public java.util.List networkAuthTypeList;
		field public java.lang.String operatorFriendlyName;
		field public java.util.List osuProviderList;
		field public java.util.List roamingConsortiumList;
		field public java.lang.String venueName;
		field public android.net.wifi.passpoint.WifiPasspointInfo.WanMetrics wanMetrics;
		}

		public static class WifiPasspointInfo.CellularNetwork {
		ctor public WifiPasspointInfo.CellularNetwork();
		field public java.lang.String mcc;
		field public java.lang.String mnc;
		}

		public static class WifiPasspointInfo.IpAddressType {
		ctor public WifiPasspointInfo.IpAddressType();
		method public int getIpv4Availability();
		method public int getIpv6Availability();
		field public static final int IPV4_DOUBLE_NAT = 4; // 0x4
		field public static final int IPV4_NOT_AVAILABLE = 0; // 0x0
		field public static final int IPV4_PORT_RESTRICTED = 2; // 0x2
		field public static final int IPV4_PORT_RESTRICTED_DOUBLE_NAT = 6; // 0x6
		field public static final int IPV4_PORT_RESTRICTED_SINGLE_NAT = 5; // 0x5
		field public static final int IPV4_PORT_UNKNOWN = 7; // 0x7
		field public static final int IPV4_PUBLIC = 1; // 0x1
		field public static final int IPV4_SINGLE_NAT = 3; // 0x3
		field public static final int IPV6_AVAILABLE = 1; // 0x1
		field public static final int IPV6_NOT_AVAILABLE = 0; // 0x0
		field public static final int IPV6_UNKNOWN = 2; // 0x2
		field public int availability;
		}

		public static class WifiPasspointInfo.IpProtoPort {
		ctor public WifiPasspointInfo.IpProtoPort();
		field public static final int STATUS_CLOSED = 0; // 0x0
		field public static final int STATUS_OPEN = 1; // 0x1
		field public static final int STATUS_UNKNOWN = 2; // 0x2
		field public int port;
		field public int proto;
		field public int status;
		}

		public static class WifiPasspointInfo.NaiRealm {
		ctor public WifiPasspointInfo.NaiRealm();
		field public static final int ENCODING_RFC4282 = 0; // 0x0
		field public static final int ENCODING_UTF8 = 1; // 0x1
		field public int encoding;
		field public java.lang.String realm;
		}

		public static class WifiPasspointInfo.NetworkAuthType {
		ctor public WifiPasspointInfo.NetworkAuthType();
		field public static final int TYPE_DNS_REDIRECTION = 3; // 0x3
		field public static final int TYPE_HTTP_REDIRECTION = 2; // 0x2
		field public static final int TYPE_ONLINE_ENROLLMENT = 1; // 0x1
		field public static final int TYPE_TERMS_AND_CONDITION = 0; // 0x0
		field public java.lang.String redirectUrl;
		field public int type;
		}

		public static class WifiPasspointInfo.WanMetrics {
		ctor public WifiPasspointInfo.WanMetrics();
		method public boolean getAtCapacity();
		method public int getLinkStatus();
		method public boolean getSymmetricLink();
		field public static final int STATUS_DOWN = 2; // 0x2
		field public static final int STATUS_RESERVED = 0; // 0x0
		field public static final int STATUS_TEST = 3; // 0x3
		field public static final int STATUS_UP = 1; // 0x1
		field public int downlinkLoad;
		field public long downlinkSpeed;
		field public int lmd;
		field public int uplinkLoad;
		field public long uplinkSpeed;
		field public int wanInfo;
		}

		public class WifiPasspointManager {
		ctor public WifiPasspointManager(android.content.Context, android.net.wifi.passpoint.IWifiPasspointManager);
		method public android.os.Messenger getMessenger();
		method public android.net.wifi.passpoint.WifiPasspointManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.passpoint.WifiPasspointManager.ChannelListener);
		method public void requestAnqpInfo(android.net.wifi.passpoint.WifiPasspointManager.Channel, java.util.List<android.net.wifi.ScanResult>, int, android.net.wifi.passpoint.WifiPasspointManager.ActionListener);
		field public static final java.lang.String PASSPOINT_CRED_CHANGED_ACTION = "android.net.wifi.passpoint.CRED_CHANGE";
		field public static final java.lang.String PASSPOINT_OSU_AVAILABLE_ACTION = "android.net.wifi.passpoint.OSU_AVAILABLE";
		field public static final int PASSPOINT_STATE_ACCESS = 3; // 0x3
		field public static final java.lang.String PASSPOINT_STATE_CHANGED_ACTION = "android.net.wifi.passpoint.STATE_CHANGE";
		field public static final int PASSPOINT_STATE_DISABLED = 1; // 0x1
		field public static final int PASSPOINT_STATE_DISCOVERY = 2; // 0x2
		field public static final int PASSPOINT_STATE_PROVISION = 4; // 0x4
		field public static final int PASSPOINT_STATE_UNKNOWN = 0; // 0x0
		field public static final java.lang.String PASSPOINT_USER_REM_REQ_ACTION = "android.net.wifi.passpoint.USER_REM_REQ";
		field public static final java.lang.String PROTOCOL_DM = "OMA-DM-ClientInitiated";
		field public static final java.lang.String PROTOCOL_SOAP = "SPP-ClientInitiated";
		field public static final int REASON_BUSY = 2; // 0x2
		field public static final int REASON_ERROR = 0; // 0x0
		field public static final int REASON_INVALID_PARAMETER = 3; // 0x3
		field public static final int REASON_NOT_TRUSTED = 4; // 0x4
		field public static final int REASON_WIFI_DISABLED = 1; // 0x1
		field public static final int REQUEST_ANQP_INFO = 163841; // 0x28001
		field public static final int REQUEST_ANQP_INFO_FAILED = 163842; // 0x28002
		field public static final int REQUEST_ANQP_INFO_SUCCEEDED = 163843; // 0x28003
		field public static final int REQUEST_OSU_ICON = 163844; // 0x28004
		field public static final int REQUEST_OSU_ICON_FAILED = 163845; // 0x28005
		field public static final int REQUEST_OSU_ICON_SUCCEEDED = 163846; // 0x28006
		field public static final int START_OSU = 163847; // 0x28007
		field public static final int START_OSU_BROWSER = 163848; // 0x28008
		field public static final int START_OSU_FAILED = 163849; // 0x28009
		field public static final int START_OSU_SUCCEEDED = 163850; // 0x2800a
		}

		public static abstract interface WifiPasspointManager.ActionListener {
		method public abstract void onFailure(int);
		method public abstract void onSuccess();
		}

		public static class WifiPasspointManager.Channel {
		}

		public static abstract interface WifiPasspointManager.ChannelListener {
		method public abstract void onChannelDisconnected();
		}

		public static class WifiPasspointManager.ParcelableString implements android.os.Parcelable {
		ctor public WifiPasspointManager.ParcelableString();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public java.lang.String string;
		}

		public class WifiPasspointOsuProvider implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public java.lang.String friendlyName;
		field public java.lang.Object icon;
		field public java.lang.String iconFileName;
		field public int iconHeight;
		field public java.lang.String iconType;
		field public int iconWidth;
		field public java.lang.String osuNai;
		field public java.lang.String osuService;
		field public java.lang.String ssid;
		}

		}

		package android.nfc {

		public class FormatException extends java.lang.Exception {

core/java/android/app/ContextImpl.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -92,8 +92,6 @@ import android.net.nsd.INsdManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.IWifiManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.passpoint.IWifiPasspointManager;
		import android.net.wifi.passpoint.WifiPasspointManager;
		import android.net.wifi.p2p.IWifiP2pManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.net.wifi.IWifiScanner;
		@@ -600,13 +598,6 @@ class ContextImpl extends Context {
		return new WifiManager(ctx.getOuterContext(), service);
		}});

		registerService(WIFI_PASSPOINT_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(WIFI_PASSPOINT_SERVICE);
		IWifiPasspointManager service = IWifiPasspointManager.Stub.asInterface(b);
		return new WifiPasspointManager(ctx.getOuterContext(), service);
		}});

		registerService(WIFI_P2P_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(WIFI_P2P_SERVICE);

wifi/java/android/net/wifi/ScanResult.java

+0 −20

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.net.wifi;

		import android.net.wifi.passpoint.WifiPasspointInfo;
		import android.net.wifi.passpoint.WifiPasspointManager;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -158,12 +156,6 @@ public class ScanResult implements Parcelable {
		*/
		public int distanceSdCm;

		/**
		* Passpoint ANQP information. This is not fetched automatically.
		* Use {@link WifiPasspointManager#requestAnqpInfo} to request ANQP info.
		*/
		public WifiPasspointInfo passpoint;

		/**
		* {@hide}
		*/
		@@ -260,7 +252,6 @@ public class ScanResult implements Parcelable {
		distanceCm = source.distanceCm;
		distanceSdCm = source.distanceSdCm;
		seen = source.seen;
		passpoint = source.passpoint;
		autoJoinStatus = source.autoJoinStatus;
		untrusted = source.untrusted;
		numConnection = source.numConnection;
		@@ -298,7 +289,6 @@ public class ScanResult implements Parcelable {
		sb.append(", distanceSd: ").append((distanceSdCm != UNSPECIFIED ? distanceSdCm : "?")).
		append("(cm)");

		sb.append(", passpoint: ").append(passpoint != null ? "yes" : "no");
		if (autoJoinStatus != 0) {
		sb.append(", status: ").append(autoJoinStatus);
		}
		@@ -330,12 +320,6 @@ public class ScanResult implements Parcelable {
		dest.writeInt(untrusted ? 1 : 0);
		dest.writeInt(numConnection);
		dest.writeInt(numUsage);
		if (passpoint != null) {
		dest.writeInt(1);
		passpoint.writeToParcel(dest, flags);
		} else {
		dest.writeInt(0);
		}
		if (informationElements != null) {
		dest.writeInt(informationElements.length);
		for (int i = 0; i < informationElements.length; i++) {
		@@ -370,10 +354,6 @@ public class ScanResult implements Parcelable {
		sr.autoJoinStatus = in.readInt();
		sr.untrusted = in.readInt() != 0;
		sr.numConnection = in.readInt();
		sr.numUsage = in.readInt();
		if (in.readInt() == 1) {
		sr.passpoint = WifiPasspointInfo.CREATOR.createFromParcel(in);
		}
		int n = in.readInt();
		if (n != 0) {
		sr.informationElements = new InformationElement[n];

wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl

deleted100644 → 0

+0 −35

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2014, 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.passpoint;

		import android.net.wifi.ScanResult;
		import android.net.wifi.passpoint.WifiPasspointPolicy;
		import android.net.wifi.passpoint.WifiPasspointCredential;
		import android.os.Messenger;

		/**
		* Interface that allows controlling and querying Wifi Passpoint connectivity.
		*
		* {@hide}
		*/
		interface IWifiPasspointManager
		{
		Messenger getMessenger();

		int getPasspointState();
		}