Merge "Register RttManager correctly"

This commit is contained in:
David Su
2020-02-05 18:25:56 +00:00
committed by Android (Google) Code Review

View File

@@ -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);
}
);
}
}