Merge "Register RttManager correctly" (8a6f7056) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiFrameworkInitializer.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -101,15 +101,6 @@ public class WifiFrameworkInitializer {
		return new WifiScanner(context, service, getInstanceLooper());
		}
		);
		SystemServiceRegistry.registerContextAwareService(
		Context.WIFI_RTT_SERVICE,
		RttManager.class,
		(context, serviceBinder) -> {
		IWifiRttManager service = IWifiRttManager.Stub.asInterface(serviceBinder);
		WifiRttManager wifiRttManager = new WifiRttManager(context, service);
		return new RttManager(context, wifiRttManager);
		}
		);
		SystemServiceRegistry.registerContextAwareService(
		Context.WIFI_RTT_RANGING_SERVICE,
		WifiRttManager.class,
		@@ -118,5 +109,13 @@ public class WifiFrameworkInitializer {
		return new WifiRttManager(context, service);
		}
		);
		SystemServiceRegistry.registerContextAwareService(
		Context.WIFI_RTT_SERVICE,
		RttManager.class,
		context -> {
		WifiRttManager wifiRttManager = context.getSystemService(WifiRttManager.class);
		return new RttManager(context, wifiRttManager);
		}
		);
		}
		}