Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AWARE] Check dynamic location permission

Browse Source 
Add check for dynamic location permission.

Bug: 70499417
Test: unit tests, integration tests, CtsVerifier
Change-Id: I293f21082c5a3d77362fb3d1db727130d7e41ec5
This commit is contained in:
Etan Cohen
2017-12-18 16:58:36 -08:00
parent e1080cfceb
commit 997dbef4eb
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl
View File

@@ -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

4
wifi/java/android/net/wifi/aware/WifiAwareManager.java
View File

@@ -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) {

16
wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java
View File

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