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

Commit 3eec2834 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix a NPE when displaying device detail page."

parents 684e8b89 7020d975

src/com/android/settings/bluetooth/BluetoothDetailsController.java

+1 −1
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ public abstract class BluetoothDetailsController extends AbstractPreferenceContr 


    @Override

    public final void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        init(screen);

        super.displayPreference(screen);

    }



    /**

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.junit.runner.RunWith; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows=SettingsShadowBluetoothDevice.class)

public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RuntimeEnvironment;



public class BluetoothDetailsControllerTestBase {

    protected Context mContext = RuntimeEnvironment.application;

    protected Context mContext;

    protected Lifecycle mLifecycle;

    protected DeviceConfig mDeviceConfig;

    protected BluetoothDevice mDevice;
@@ -58,6 +58,7 @@ public class BluetoothDetailsControllerTestBase { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = RuntimeEnvironment.application;

        mPreferenceManager = new PreferenceManager(mContext);

        mScreen = mPreferenceManager.createPreferenceScreen(mContext);

        mDeviceConfig = makeDefaultDeviceConfig();

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import org.mockito.Mock; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows={SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class,

                SettingsShadowResources.class})

public class BluetoothDetailsHeaderControllerTest extends BluetoothDetailsControllerTestBase {

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressControllerTest.java

+4 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ package com.android.settings.bluetooth; 


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



import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

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

import com.android.settingslib.widget.FooterPreference;
@@ -27,9 +27,10 @@ import org.junit.runner.RunWith; 
import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows = SettingsShadowBluetoothDevice.class)

public class BluetoothDetailsMacAddressControllerTest extends BluetoothDetailsControllerTestBase {



    private BluetoothDetailsMacAddressController mController;



    @Override