LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix PermissionMonitorTest that has been failing." into pi-dev

Browse Source 
am: 6e66280d35

Change-Id: Ifb04fdda2b54b0bde8b6eeead3e0240d5cc1ff79
This commit is contained in:
Chalard Jean
2018-04-02 20:14:29 +00:00
committed by android-build-merger
parent 3c76aae4f2 94de1787a4
commit fe455cfc35
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java
View File

@@ -26,6 +26,8 @@ import static android.content.pm.PackageManager.GET_PERMISSIONS;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
@@ -62,8 +64,8 @@ public class PermissionMonitorTest {
private void expectPermission(String[] permissions, boolean preinstalled) throws Exception { private void expectPermission(String[] permissions, boolean preinstalled) throws Exception {
final PackageInfo packageInfo = packageInfoWithPermissions(permissions, preinstalled); final PackageInfo packageInfo = packageInfoWithPermissions(permissions, preinstalled);
when(mPackageManager.getPackageInfo(MOCK_PACKAGE_NAMES[0], GET_PERMISSIONS)) when(mPackageManager.getPackageInfoAsUser(
.thenReturn(packageInfo); eq(MOCK_PACKAGE_NAMES[0]), eq(GET_PERMISSIONS), anyInt())).thenReturn(packageInfo);
} }
private PackageInfo packageInfoWithPermissions(String[] permissions, boolean preinstalled) { private PackageInfo packageInfoWithPermissions(String[] permissions, boolean preinstalled) {