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

Merge "TetheringTests: Stop using @hide Wifi P2P APIs" am: 57726b758e am: e87929a4b8

Browse Source 
Change-Id: Ifcfcfcceda89add886c2b99b5f4647d83d3967d9
This commit is contained in:
Automerger Merge Worker
2020-01-16 07:12:06 +00:00
parent feb7f9cf81 e87929a4b8
commit 8b9a742ff4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/Tethering/tests/unit/src/com/android/server/connectivity/tethering/TetheringTest.java
View File

@@ -497,13 +497,15 @@ public class TetheringTest {
p2pInfo.groupFormed = isGroupFormed;
p2pInfo.isGroupOwner = isGroupOwner;
WifiP2pGroup group = new WifiP2pGroup();
group.setIsGroupOwner(isGroupOwner);
group.setInterface(ifname);
WifiP2pGroup group = mock(WifiP2pGroup.class);
when(group.isGroupOwner()).thenReturn(isGroupOwner);
when(group.getInterface()).thenReturn(ifname);
final Intent intent = mock(Intent.class);
when(intent.getAction()).thenReturn(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
when(intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_INFO)).thenReturn(p2pInfo);
when(intent.getParcelableExtra(WifiP2pManager.EXTRA_WIFI_P2P_GROUP)).thenReturn(group);
final Intent intent = new Intent(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
intent.putExtra(WifiP2pManager.EXTRA_WIFI_P2P_INFO, p2pInfo);
intent.putExtra(WifiP2pManager.EXTRA_WIFI_P2P_GROUP, group);
mServiceContext.sendBroadcastAsUserMultiplePermissions(intent, UserHandle.ALL,
P2P_RECEIVER_PERMISSIONS_FOR_BROADCAST);
}