Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Wifi"
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
index 75cb0b6..8ae7d0e 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkFactoryTest.java
@@ -182,6 +182,8 @@
when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getSystemService(eq(Context.CONNECTIVITY_SERVICE)))
.thenReturn(mConnectivityManager);
+ when(mContext.getSystemService(eq(ConnectivityManager.class)))
+ .thenReturn(mConnectivityManager);
when(mContext.getSystemService(CompanionDeviceManager.class))
.thenReturn(mCompanionDeviceManager);
when(mPackageManager.getNameForUid(TEST_UID_1)).thenReturn(TEST_PACKAGE_NAME_1);
diff --git a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index 3050ff4..666b374 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -152,6 +152,7 @@
mMockLooperHandler = new Handler(mMockLooper.getLooper());
when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mMockCm);
+ when(mMockContext.getSystemService(ConnectivityManager.class)).thenReturn(mMockCm);
when(mMockContext.getSystemServiceName(PowerManager.class)).thenReturn(
Context.POWER_SERVICE);
when(mMockContext.getSystemService(PowerManager.class)).thenReturn(mMockPowerManager);
@@ -428,7 +429,7 @@
verifyRequestDeclaredUnfullfillable(nr);
// failure if there's further activity
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper);
}
/**
@@ -548,7 +549,7 @@
inOrderM.verify(mAwareMetricsMock).recordNdpSessionDuration(anyLong());
}
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper);
}
/**
@@ -690,7 +691,7 @@
inOrder.verify(mMockNetdWrapper).setInterfaceDown(anyString());
inOrderM.verify(mAwareMetricsMock).recordNdpSessionDuration(anyLong());
- verifyNoMoreInteractions(mMockNative, mMockCm, mMockCallback, mMockSessionCallback,
+ verifyNoMoreInteractions(mMockNative, mMockCallback, mMockSessionCallback,
mAwareMetricsMock, mMockNetdWrapper);
}
@@ -769,7 +770,7 @@
// verify that each interface name is unique
assertEquals("Number of unique interface names", numNdis, interfaces.size());
- verifyNoMoreInteractions(mMockNative, mMockCm, mMockCallback, mMockSessionCallback,
+ verifyNoMoreInteractions(mMockNative, mMockCallback, mMockSessionCallback,
mAwareMetricsMock, mMockNetdWrapper);
}
@@ -1179,7 +1180,7 @@
eq(ndpId), eq(""), eq(null), eq(null), eq(null), anyBoolean(), any());
}
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper);
}
private void testDataPathInitiatorResponderInvalidUidUtility(boolean doPublish)
@@ -1240,7 +1241,7 @@
eq(ndpId), eq(""), eq(null), eq(null), eq(null), anyBoolean(), any());
}
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper);
}
private void testDataPathInitiatorResponderInvalidPackageNameUtility(boolean doPublish)
@@ -1301,7 +1302,7 @@
eq(ndpId), eq(""), eq(null), eq(null), eq(null), anyBoolean(), any());
}
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper);
}
private void testDataPathInitiatorUtility(boolean useDirect, boolean provideMac,
@@ -1382,7 +1383,7 @@
inOrderM.verify(mAwareMetricsMock).recordNdpStatus(eq(NanStatusType.INTERNAL_FAILURE),
eq(useDirect), anyLong());
verifyRequestDeclaredUnfullfillable(nr);
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock);
return;
}
@@ -1482,7 +1483,7 @@
inOrderM.verify(mAwareMetricsMock).recordNdpSessionDuration(anyLong());
}
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper,
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper,
mMockNetworkInterface);
}
@@ -1604,7 +1605,7 @@
mMockLooper.dispatchAll();
}
- verifyNoMoreInteractions(mMockNative, mMockCm, mAwareMetricsMock, mMockNetdWrapper);
+ verifyNoMoreInteractions(mMockNative, mAwareMetricsMock, mMockNetdWrapper);
}
private NetworkRequest getSessionNetworkRequest(int clientId, int sessionId,
diff --git a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
index 7292fca..5217f36 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareStateManagerTest.java
@@ -149,6 +149,8 @@
when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
mock(ConnectivityManager.class));
+ when(mMockContext.getSystemService(ConnectivityManager.class)).thenReturn(
+ mock(ConnectivityManager.class));
when(mMockContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mMockAppOpsManager);
when(mMockContext.getSystemServiceName(PowerManager.class)).thenReturn(
Context.POWER_SERVICE);
