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

Commit 633a67c8 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Introduce BasebandVersionDialogController 

 - Create a controller to display data and for the
  baseband version field in FirmwareVersionDialogFragment

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I6818966f43549f41f20a488190e3116322858089
parent bebb100e

src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -21,9 +21,14 @@ import android.support.v7.preference.Preference; 


import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController;

import com.android.settingslib.Utils;

import com.android.settingslib.core.AbstractPreferenceController;



/**

 * deprecated in favor of {@link BasebandVersionDialogController}

 */

@Deprecated

public class BasebandVersionPreferenceController extends AbstractPreferenceController implements

        PreferenceControllerMixin {

src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java

0 → 100644
+55 −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.deviceinfo.firmwareversion;



import android.content.Context;

import android.os.SystemProperties;

import android.support.annotation.VisibleForTesting;



import com.android.settings.R;

import com.android.settings.Utils;



public class BasebandVersionDialogController {



    @VisibleForTesting

    static final int BASEBAND_VERSION_LABEL_ID = R.id.baseband_version_label;

    @VisibleForTesting

    static final int BASEBAND_VERSION_VALUE_ID = R.id.baseband_version_value;

    @VisibleForTesting

    static final String BASEBAND_PROPERTY = "gsm.version.baseband";



    private final FirmwareVersionDialogFragment mDialog;



    public BasebandVersionDialogController(FirmwareVersionDialogFragment dialog) {

        mDialog = dialog;

    }



    /**

     * Updates the baseband version field of the dialog.

     */

    public void initialize() {

        final Context context = mDialog.getContext();

        if (Utils.isWifiOnly(context)) {

            mDialog.removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);

            mDialog.removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);

            return;

        }



        mDialog.setText(BASEBAND_VERSION_VALUE_ID, SystemProperties.get(BASEBAND_PROPERTY,

                context.getString(R.string.device_info_default)));

    }

}

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -86,5 +86,6 @@ public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment { 
    private void initializeControllers() {

        new FirmwareVersionDialogController(this).initialize();

        new SecurityPatchLevelDialogController(this).initialize();

        new BasebandVersionDialogController(this).initialize();

    }

}

tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java

0 → 100644
+97 −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.deviceinfo.firmwareversion;



import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController

        .BASEBAND_PROPERTY;

import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController

        .BASEBAND_VERSION_LABEL_ID;

import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController

        .BASEBAND_VERSION_VALUE_ID;



import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.robolectric.shadow.api.Shadow.extract;



import android.content.Context;

import android.net.ConnectivityManager;

import android.os.SystemProperties;



import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;

import com.android.settings.testutils.shadow.ShadowConnectivityManager;



import org.junit.After;

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;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {ShadowConnectivityManager.class, SettingsShadowSystemProperties.class})

public class BasebandVersionDialogControllerTest {



    @Mock

    private FirmwareVersionDialogFragment mDialog;



    private Context mContext;

    private BasebandVersionDialogController mController;



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        when(mDialog.getContext()).thenReturn(mContext);

        mController = new BasebandVersionDialogController(mDialog);

    }



    @After

    public void teardown() {

        SettingsShadowSystemProperties.clear();

    }



    @Test

    public void initialize_wifiOnly_shouldRemoveSettingFromDialog() {

        ShadowConnectivityManager connectivityManager =

                extract(mContext.getSystemService(ConnectivityManager.class));

        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);



        mController.initialize();



        verify(mDialog).removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);

        verify(mDialog).removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);

    }



    @Test

    public void initialize_hasMobile_shouldSetDialogTextToBasebandVersion() {

        final String text = "test";

        SystemProperties.set(BASEBAND_PROPERTY, text);

        ShadowConnectivityManager connectivityManager =

                extract(mContext.getSystemService(ConnectivityManager.class));

        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);



        mController.initialize();



        verify(mDialog).setText(BASEBAND_VERSION_VALUE_ID, text);

    }

}