diff options
3 files changed, 12 insertions, 12 deletions
diff --git a/wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl b/wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl index bad5ce226efc..c4b24cfa2394 100644 --- a/wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl +++ b/wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl @@ -42,9 +42,9 @@ interface IWifiAwareManager in ConfigRequest configRequest, boolean notifyOnIdentityChanged); void disconnect(int clientId, in IBinder binder); - void publish(int clientId, in PublishConfig publishConfig, + void publish(in String callingPackage, int clientId, in PublishConfig publishConfig, in IWifiAwareDiscoverySessionCallback callback); - void subscribe(int clientId, in SubscribeConfig subscribeConfig, + void subscribe(in String callingPackage, int clientId, in SubscribeConfig subscribeConfig, in IWifiAwareDiscoverySessionCallback callback); // session API diff --git a/wifi/java/android/net/wifi/aware/WifiAwareManager.java b/wifi/java/android/net/wifi/aware/WifiAwareManager.java index 166da48ed90a..d57d1524d083 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareManager.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareManager.java @@ -301,7 +301,7 @@ public class WifiAwareManager { if (VDBG) Log.v(TAG, "publish(): clientId=" + clientId + ", config=" + publishConfig); try { - mService.publish(clientId, publishConfig, + mService.publish(mContext.getOpPackageName(), clientId, publishConfig, new WifiAwareDiscoverySessionCallbackProxy(this, looper, true, callback, clientId)); } catch (RemoteException e) { @@ -334,7 +334,7 @@ public class WifiAwareManager { } try { - mService.subscribe(clientId, subscribeConfig, + mService.subscribe(mContext.getOpPackageName(), clientId, subscribeConfig, new WifiAwareDiscoverySessionCallbackProxy(this, looper, false, callback, clientId)); } catch (RemoteException e) { diff --git a/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java b/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java index 653fcff84c0c..9cab66a240a7 100644 --- a/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java +++ b/wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java @@ -145,7 +145,7 @@ public class WifiAwareManagerTest { // (2) publish - should succeed PublishConfig publishConfig = new PublishConfig.Builder().build(); session.publish(publishConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).publish(eq(clientId), eq(publishConfig), any()); + inOrder.verify(mockAwareService).publish(any(), eq(clientId), eq(publishConfig), any()); // (3) disconnect session.close(); @@ -197,7 +197,7 @@ public class WifiAwareManagerTest { // (4) subscribe: should succeed SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().build(); session.subscribe(subscribeConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).subscribe(eq(clientId), eq(subscribeConfig), any()); + inOrder.verify(mockAwareService).subscribe(any(), eq(clientId), eq(subscribeConfig), any()); verifyNoMoreInteractions(mockCallback, mockSessionCallback, mockAwareService); } @@ -280,7 +280,7 @@ public class WifiAwareManagerTest { // (1) publish session.publish(publishConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).publish(eq(clientId), eq(publishConfig), + inOrder.verify(mockAwareService).publish(any(), eq(clientId), eq(publishConfig), sessionProxyCallback.capture()); // (2) publish session created @@ -372,7 +372,7 @@ public class WifiAwareManagerTest { // (2) publish: successfully - then terminated session.publish(publishConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).publish(eq(clientId), eq(publishConfig), + inOrder.verify(mockAwareService).publish(any(), eq(clientId), eq(publishConfig), sessionProxyCallback.capture()); sessionProxyCallback.getValue().onSessionStarted(sessionId); sessionProxyCallback.getValue().onSessionTerminated(0); @@ -429,7 +429,7 @@ public class WifiAwareManagerTest { // (1) subscribe session.subscribe(subscribeConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).subscribe(eq(clientId), eq(subscribeConfig), + inOrder.verify(mockAwareService).subscribe(any(), eq(clientId), eq(subscribeConfig), sessionProxyCallback.capture()); // (2) subscribe session created @@ -514,7 +514,7 @@ public class WifiAwareManagerTest { // (2) subscribe: successfully - then terminated session.subscribe(subscribeConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).subscribe(eq(clientId), eq(subscribeConfig), + inOrder.verify(mockAwareService).subscribe(any(), eq(clientId), eq(subscribeConfig), sessionProxyCallback.capture()); sessionProxyCallback.getValue().onSessionStarted(sessionId); sessionProxyCallback.getValue().onSessionTerminated(0); @@ -912,7 +912,7 @@ public class WifiAwareManagerTest { // (2) publish successfully session.publish(publishConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).publish(eq(clientId), eq(publishConfig), + inOrder.verify(mockAwareService).publish(any(), eq(clientId), eq(publishConfig), sessionProxyCallback.capture()); sessionProxyCallback.getValue().onSessionStarted(sessionId); mMockLooper.dispatchAll(); @@ -1089,7 +1089,7 @@ public class WifiAwareManagerTest { // (2) publish successfully session.publish(publishConfig, mockSessionCallback, mMockLooperHandler); - inOrder.verify(mockAwareService).publish(eq(clientId), eq(publishConfig), + inOrder.verify(mockAwareService).publish(any(), eq(clientId), eq(publishConfig), sessionProxyCallback.capture()); sessionProxyCallback.getValue().onSessionStarted(sessionId); mMockLooper.dispatchAll(); |