diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 10 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 8b07418668ba..9b7306089dca 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -132,7 +132,7 @@ import android.net.lowpan.LowpanManager; import android.net.nsd.INsdManager; import android.net.nsd.NsdManager; import android.net.wifi.WifiFrameworkInitializer; -import android.net.wifi.wificond.WifiCondManager; +import android.net.wifi.wificond.WifiNl80211Manager; import android.nfc.NfcManager; import android.os.BatteryManager; import android.os.BatteryStats; @@ -761,11 +761,11 @@ public final class SystemServiceRegistry { return new EthernetManager(ctx.getOuterContext(), service); }}); - registerService(Context.WIFI_COND_SERVICE, WifiCondManager.class, - new CachedServiceFetcher<WifiCondManager>() { + registerService(Context.WIFI_NL80211_SERVICE, WifiNl80211Manager.class, + new CachedServiceFetcher<WifiNl80211Manager>() { @Override - public WifiCondManager createService(ContextImpl ctx) { - return new WifiCondManager(ctx.getOuterContext()); + public WifiNl80211Manager createService(ContextImpl ctx) { + return new WifiNl80211Manager(ctx.getOuterContext()); } }); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 49f62f407806..cfba9f4cd10a 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4064,16 +4064,16 @@ public abstract class Context { /** * Use with {@link #getSystemService(String)} to retrieve a - * {@link android.net.wifi.WifiCondManager} for handling management of the Wi-Fi control - * daemon. + * {@link android.net.wifi.wificond.WifiNl80211Manager} for handling management of the + * Wi-Fi nl802.11 daemon (wificond). * * @see #getSystemService(String) - * @see android.net.wifi.WifiCondManager + * @see android.net.wifi.wificond.WifiNl80211Manager * @hide */ @SystemApi @SuppressLint("ServiceName") - public static final String WIFI_COND_SERVICE = "wificond"; + public static final String WIFI_NL80211_SERVICE = "wifinl80211"; /** * Use with {@link #getSystemService(String)} to retrieve a {@link |