PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable always-on VPN options if an app has opted out."

Browse Source
This commit is contained in:
Charles He
2017-07-18 18:47:34 +00:00
committed by Android (Google) Code Review
parent 4b351b4ca1 fc1ce57b13
commit c22e4d68c8
2 changed files with 13 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
View File

@@ -16,26 +16,26 @@
package com.android.settings.vpn2;
import static com.android.settings.vpn2.AppManagementFragment.isAlwaysOnSupportedByApp;
import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.when;
import android.app.AppOpsManager;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.os.Build;
import android.os.Process;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import android.content.Context;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
public class AppSettingsTest extends AndroidTestCase {
private static final String TAG = AppSettingsTest.class.getSimpleName();
@@ -48,23 +48,6 @@ public class AppSettingsTest extends AndroidTestCase {
when(mContext.getSystemService(eq(Context.APP_OPS_SERVICE))).thenReturn(mAppOps);
}
@SmallTest
public void testAlwaysOnVersionRestriction() {
ApplicationInfo mockApp = createMockApp();
// API 23 (MNC) = not supported
mockApp.targetSdkVersion = Build.VERSION_CODES.M;
assertFalse(isAlwaysOnSupportedByApp(mockApp));
// API 24 (NYC) = supported
mockApp.targetSdkVersion = Build.VERSION_CODES.N;
assertTrue(isAlwaysOnSupportedByApp(mockApp));
// API 25 (NYC MR1) = supported
mockApp.targetSdkVersion = Build.VERSION_CODES.N_MR1;
assertTrue(isAlwaysOnSupportedByApp(mockApp));
}
@SmallTest
public void testAppOpsRequiredToOpenFragment() {
ApplicationInfo mockApp = createMockApp();