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

Commit 1f02ca76 authored by Jeffrey Huang's avatar Jeffrey Huang Committed by Android (Google) Code Review
Browse files

Merge "Introduce BugReportPreferenceControllerV2"

parents 20da1c4b 7f578fb1

src/com/android/settings/development/BugReportPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ import android.support.v7.preference.PreferenceScreen; 
import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.core.AbstractPreferenceController;



/**

 * deprecated in favor of {@link BugReportPreferenceControllerV2}

 */

@Deprecated

public class BugReportPreferenceController extends AbstractPreferenceController implements

        PreferenceControllerMixin {

src/com/android/settings/development/BugReportPreferenceControllerV2.java

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

 * Copyright (C) 2016 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.development;



import android.content.Context;

import android.os.UserManager;



public class BugReportPreferenceControllerV2 extends DeveloperOptionsPreferenceController {



    private static final String KEY_BUGREPORT = "bugreport";



    private final UserManager mUserManager;



    public BugReportPreferenceControllerV2(Context context) {

        super(context);



        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);

    }



    @Override

    public boolean isAvailable() {

        return !mUserManager.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);

    }



    @Override

    public String getPreferenceKey() {

        return KEY_BUGREPORT;

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        // intentional no-op

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        // intentional no-op

    }

}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        // take bug report

        controllers.add(new BugReportPreferenceControllerV2(context));

        controllers.add(new LocalBackupPasswordPreferenceController(context));

        controllers.add(new StayAwakePreferenceController(context, lifecycle));

        // hdcp checking

tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



/**

 * deprecated in favor of {@link BugReportPreferenceControllerV2}

 */

@Deprecated

@RunWith(SettingsRobolectricTestRunner.class)

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

public class BugReportPreferenceControllerTest {

tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerV2Test.java

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

 * Copyright (C) 2016 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.development;



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



import static org.mockito.Matchers.anyString;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.os.UserManager;



import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

public class BugReportPreferenceControllerV2Test {



    @Mock

    private Context mContext;

    @Mock

    private UserManager mUserManager;



    private BugReportPreferenceControllerV2 mController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);

        mController = new BugReportPreferenceControllerV2(mContext);

    }



    @Test

    public void isAvailable_hasDebugRestriction_shouldBeFalse() {

        when(mUserManager.hasUserRestriction(anyString())).thenReturn(true);



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

    }



    @Test

    public void isAvailable_noDebugRestriction_shouldBeTrue() {

        when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);



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

    }

}