Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ed4746b authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Don't hide network reset even if it's disabled by admin." into oc-dev am: b5046008 

am: 5acb0357

Change-Id: Ie8e346d71eaf4c3617753c83846cbd723582109e
parents 5801c66a 5acb0357

res/xml/reset_dashboard_fragment.xml

+3 −1
Original line number Diff line number Diff line
@@ -21,9 +21,11 @@ 
    android:title="@string/reset_dashboard_title">



    <!-- Network reset -->

    <Preference

    <com.android.settingslib.RestrictedPreference

        android:key="network_reset_pref"

        android:title="@string/reset_network_title"

        settings:userRestriction="no_network_reset"

        settings:useAdminDisabledSummary="true"

        android:fragment="com.android.settings.ResetNetwork" />



    <!-- Reset app preferences -->

src/com/android/settings/network/NetworkResetPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public class NetworkResetPreferenceController extends PreferenceController { 


    @Override

    public boolean isAvailable() {

        return !mRestrictionChecker.hasRestriction();

        return !mRestrictionChecker.hasUserRestriction();

    }



    @Override

src/com/android/settings/network/NetworkResetRestrictionChecker.java

+6 −2
Original line number Diff line number Diff line
@@ -45,9 +45,13 @@ public class NetworkResetRestrictionChecker { 
                mContext, UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId()) != null;

    }



    boolean hasRestriction() {

    boolean hasUserRestriction() {

        return !mUserManager.isAdminUser()

                || hasUserBaseRestriction()

                || hasUserBaseRestriction();

    }



    boolean hasRestriction() {

        return hasUserRestriction()

                || isRestrictionEnforcedByAdmin();

    }

}

tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.network;





import android.content.Context;



import com.android.settings.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class NetworkResetPreferenceControllerTest {



    @Mock

    private NetworkResetRestrictionChecker mRestrictionChecker;

    private Context mContext;

    private NetworkResetPreferenceController mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mController = new NetworkResetPreferenceController(mContext);

        ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);

    }



    @Test

    public void testIsAvailable_shouldReturnTrueWhenNoUserRestriction() {

        when(mRestrictionChecker.isRestrictionEnforcedByAdmin()).thenReturn(true);



        when(mRestrictionChecker.hasUserRestriction()).thenReturn(true);



        assertThat(mController.isAvailable()).isFalse();



        when(mRestrictionChecker.hasUserRestriction()).thenReturn(false);



        assertThat(mController.isAvailable()).isTrue();

        verify(mRestrictionChecker, never()).isRestrictionEnforcedByAdmin();

    }

}