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

Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.

Browse Source 
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
This commit is contained in:
Lorenzo Colitti
2021-02-18 16:32:47 +09:00
parent 5c9a042370
commit cacf9aa485
5 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -39,7 +39,6 @@ import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.ProxyInfo;
import android.net.VpnManager;
import android.os.UserHandle;
import android.os.UserManager;
@@ -232,16 +231,6 @@ public class EnterprisePrivacyFeatureProviderImplTest {
assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isTrue();
}
@Test
public void testIsGlobalHttpProxySet() {
when(mConnectivityManger.getGlobalProxy()).thenReturn(null);
assertThat(mProvider.isGlobalHttpProxySet()).isFalse();
when(mConnectivityManger.getGlobalProxy())
.thenReturn(ProxyInfo.buildDirectProxy("localhost", 123));
assertThat(mProvider.isGlobalHttpProxySet()).isTrue();
}
@Test
public void testGetMaximumFailedPasswordsForWipeInCurrentUser() {
when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(null);