diff options
| author | Roger Chang <roger.chang@mediatek.com> | 2014-05-15 14:46:49 -0700 |
|---|---|---|
| committer | Yuhao Zheng <yuhaozheng@google.com> | 2014-05-20 18:25:56 -0700 |
| commit | 7fee7232ee2ae45fb3cd4fcce314e8f1101ae8db (patch) | |
| tree | 3133625ec194cb59ce0f8f37f47ac54369ca4d34 /core/java/android | |
| parent | 193909da71a342519ad640d157c122a38b6d1a3e (diff) | |
Hotspot 2.0 framework - add implementation
Bug: 5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 8 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index b247580b06a5..9053af27184b 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -81,8 +81,8 @@ 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.IPasspointManager; -import android.net.wifi.passpoint.PasspointManager; +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.nfc.NfcManager; @@ -581,8 +581,8 @@ class ContextImpl extends Context { registerService(WIFI_PASSPOINT_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { IBinder b = ServiceManager.getService(WIFI_PASSPOINT_SERVICE); - IPasspointManager service = IPasspointManager.Stub.asInterface(b); - return new PasspointManager(ctx.getOuterContext(), service); + IWifiPasspointManager service = IWifiPasspointManager.Stub.asInterface(b); + return new WifiPasspointManager(ctx.getOuterContext(), service); }}); registerService(WIFI_P2P_SERVICE, new ServiceFetcher() { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index c11b04c7c282..9e02e4b0a076 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2352,11 +2352,11 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a {@link - * android.net.wifi.passpoint.PasspointManager} for handling management of + * android.net.wifi.passpoint.WifiPasspointManager} for handling management of * Wi-Fi passpoint access. * * @see #getSystemService - * @see android.net.wifi.passpoint.PasspointManager + * @see android.net.wifi.passpoint.WifiPasspointManager */ public static final String WIFI_PASSPOINT_SERVICE = "wifipasspoint"; |