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

Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823

Browse Source 
am: 35c0949b2e

Change-Id: I3f7f56e233c8fe4b06269ef031fdce43800cf782
This commit is contained in:
Salvador Martinez
2017-08-10 02:20:50 +00:00
committed by android-build-merger
parent 3253b7ee7c 35c0949b2e
commit f3692132ca
5 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
View File

@@ -26,6 +26,7 @@ import android.telephony.TelephonyManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -87,6 +88,7 @@ public class MobileNetworkPreferenceControllerTest {
}
@Test
@Config(shadows = ShadowRestrictedLockUtilsWrapper.class)
public void wifiOnly_prefIsNotAvailable() {
when(mUserManager.isAdminUser()).thenReturn(true);
when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))

28
tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java Normal file
View File

@@ -0,0 +1,28 @@
package com.android.settings.testutils.shadow;
import android.content.Context;
import com.android.settings.network.MobileNetworkPreferenceController;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@Implements(MobileNetworkPreferenceController.class)
public class ShadowMobileNetworkPreferenceController {
private static boolean mIsRestricted = false;
public void __constructor__(Context context) {
}
@Implementation
public boolean isAvailable() {
return mIsRestricted ? false : true;
}
@Implementation
public boolean isUserRestricted() {
return mIsRestricted;
}
public static void setRestricted(boolean restricted) {
mIsRestricted = restricted;
}
}

25
tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java Normal file
View File

@@ -0,0 +1,25 @@
package com.android.settings.testutils.shadow;
import android.content.Context;
import com.android.settings.network.RestrictedLockUtilsWrapper;
import org.robolectric.annotation.Implements;
/**
* Shadow for the wrapper around RestrictedLockUtils. Should be removed/updated once robolectric is
* updated to allow usage of new UserManager API's. see
* {@link com.android.settingslib.RestrictedLockUtils} and
* {@link com.android.settings.network.RestrictedLockUtilsWrapper}
*/
@Implements(RestrictedLockUtilsWrapper.class)
public class ShadowRestrictedLockUtilsWrapper {
private boolean isRestricted;
public boolean hasBaseUserRestriction(Context context, String userRestriction, int userId) {
return isRestricted;
}
public void setRestricted(boolean restricted) {
isRestricted = restricted;
}
}