From 7fee7232ee2ae45fb3cd4fcce314e8f1101ae8db Mon Sep 17 00:00:00 2001 From: Roger Chang Date: Thu, 15 May 2014 14:46:49 -0700 Subject: Hotspot 2.0 framework - add implementation Bug: 5485670 Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100 --- wifi/java/android/net/wifi/ScanResult.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'wifi/java/android/net/wifi/ScanResult.java') diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index 3e3b6e3..cfd0a51 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -16,8 +16,8 @@ package android.net.wifi; -import android.net.wifi.passpoint.PasspointInfo; -import android.net.wifi.passpoint.PasspointManager; +import android.net.wifi.passpoint.WifiPasspointInfo; +import android.net.wifi.passpoint.WifiPasspointManager; import android.os.Parcelable; import android.os.Parcel; @@ -80,10 +80,10 @@ public class ScanResult implements Parcelable { /** * Passpoint ANQP information. This is not fetched automatically. - * Use {@link PasspointManager#requestAnqpInfo} to request ANQP info. + * Use {@link WifiPasspointManager#requestAnqpInfo} to request ANQP info. * {@hide} */ - public PasspointInfo passpoint; + public WifiPasspointInfo passpoint; /** * {@hide} @@ -132,7 +132,7 @@ public class ScanResult implements Parcelable { distanceSdCm = source.distanceSdCm; seen = source.seen; if (source.passpoint != null) - passpoint = new PasspointInfo(source.passpoint); + passpoint = new WifiPasspointInfo(source.passpoint); } } @@ -219,7 +219,7 @@ public class ScanResult implements Parcelable { in.readInt() ); if (in.readInt() == 1) { - sr.passpoint = PasspointInfo.CREATOR.createFromParcel(in); + sr.passpoint = WifiPasspointInfo.CREATOR.createFromParcel(in); } return sr; } -- cgit v1.1