Reorders arguments in Context Hub Service methods
No functional change, just reordering things in internal methods to be
consistent with the API definition. Also fixes stale javadoc.
Bug: 117612105
Test: Compile only
Change-Id: I455d3d5c8f1d5077dbacfa96ad1c71da27559b8e
diff --git a/services/core/java/com/android/server/location/ContextHubService.java b/services/core/java/com/android/server/location/ContextHubService.java
index 52f1c6b..36b0342 100644
--- a/services/core/java/com/android/server/location/ContextHubService.java
+++ b/services/core/java/com/android/server/location/ContextHubService.java
@@ -173,7 +173,7 @@
for (int contextHubId : mContextHubIdToInfoMap.keySet()) {
ContextHubInfo contextHubInfo = mContextHubIdToInfoMap.get(contextHubId);
IContextHubClient client = mClientManager.registerClient(
- createDefaultClientCallback(contextHubId), contextHubInfo);
+ contextHubInfo, createDefaultClientCallback(contextHubId));
defaultClientMap.put(contextHubId, client);
try {
@@ -608,8 +608,8 @@
/**
* Creates and registers a client at the service for the specified Context Hub.
*
- * @param clientCallback the client interface to register with the service
* @param contextHubId the ID of the hub this client is attached to
+ * @param clientCallback the client interface to register with the service
* @return the generated client interface, null if registration was unsuccessful
*
* @throws IllegalArgumentException if contextHubId is not a valid ID
@@ -618,7 +618,7 @@
*/
@Override
public IContextHubClient createClient(
- IContextHubClientCallback clientCallback, int contextHubId) throws RemoteException {
+ int contextHubId, IContextHubClientCallback clientCallback) throws RemoteException {
checkPermissions();
if (!isValidContextHubId(contextHubId)) {
throw new IllegalArgumentException("Invalid context hub ID " + contextHubId);
@@ -628,7 +628,7 @@
}
ContextHubInfo contextHubInfo = mContextHubIdToInfoMap.get(contextHubId);
- return mClientManager.registerClient(clientCallback, contextHubInfo);
+ return mClientManager.registerClient(contextHubInfo, clientCallback);
}
/**