From 6c216c06f52b6689acc3636fe56e4b28c70c4ba0 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Thu, 30 Nov 2017 16:47:25 -0800 Subject: [PATCH] Fix crash for AirplaneModePreferenceController when not available. Bug: 70043779 Test: make RunSettingsRoboTests ROBOTEST_FILTER=AirplaneModePreferenceControllerTest passes 1/1. Change-Id: Ide9e1dda0589414467a4952e67d2e4e39e90845a --- .../AirplaneModePreferenceController.java | 8 +- .../AirplaneModePreferenceControllerTest.java | 87 +++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 0620f145ee4..d86f7f7980f 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -100,12 +100,16 @@ public class AirplaneModePreferenceController extends AbstractPreferenceControll } public void onResume() { - mAirplaneModeEnabler.resume(); + if (mAirplaneModeEnabler != null) { + mAirplaneModeEnabler.resume(); + } } @Override public void onPause() { - mAirplaneModeEnabler.pause(); + if (mAirplaneModeEnabler != null) { + mAirplaneModeEnabler.pause(); + } } public void onActivityResult(int requestCode, int resultCode, Intent data) { diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java new file mode 100644 index 00000000000..48c26f3320f --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -0,0 +1,87 @@ +/* + * 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 static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.content.res.Resources; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settingslib.core.lifecycle.Lifecycle; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class AirplaneModePreferenceControllerTest { + + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private Context mContext; + + @Mock + private Resources mResources; + + @Mock + private PreferenceScreen mScreen; + + @Mock + private PackageManager mPackageManager; + + private AirplaneModePreferenceController mController; + private Lifecycle mLifecycle; + private FakeFeatureFactory mFactory; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mFactory = FakeFeatureFactory.setupForTest(mContext); + doReturn(mResources).when(mContext).getResources(); + doReturn(mPackageManager).when(mContext).getPackageManager(); + mController = spy(new AirplaneModePreferenceController(mContext, null)); + mLifecycle = new Lifecycle(() -> mLifecycle); + mLifecycle.addObserver(mController); + } + + @Test + public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() { + when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true); + assertFalse(mController.isAvailable()); + + mController.displayPreference(mScreen); + + // This should not crash + mController.onResume(); + mController.onPause(); + } +}