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

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

Merge "Catch exception when checking WifiDisplay availability"

parents 78c09dfb 1389a0c9

src/com/android/settings/wfd/WifiDisplaySettings.java

+8 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.net.wifi.p2p.WifiP2pManager.Channel; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.ServiceManager;

import android.provider.Settings;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.ListPreference;
@@ -212,8 +213,13 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { 
    }



    public static boolean isAvailable(Context context) {

        try {

            return context.getSystemService(Context.DISPLAY_SERVICE) != null

                    && context.getSystemService(Context.WIFI_P2P_SERVICE) != null;

        } catch (Exception e) {

            // Service is not registered, so this is definitely not available.

            return false;

        }

    }



    private void scheduleUpdate(int changes) {

tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java

+16 −7
Original line number Diff line number Diff line
@@ -16,16 +16,23 @@ 


package com.android.settings.wfd;



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

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.Activity;

import android.content.Context;

import android.hardware.display.DisplayManager;

import android.media.MediaRouter;

import android.net.wifi.p2p.WifiP2pManager;

import android.os.ServiceManager;



import com.android.settings.R;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;
@@ -34,12 +41,6 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;



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

import static org.mockito.Mockito.mock;

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 WifiDisplaySettingsTest {
@@ -89,7 +90,15 @@ public class WifiDisplaySettingsTest { 
    public void isAvailable_noService_shouldReturnFalse() {

        assertThat(WifiDisplaySettings.isAvailable(mActivity))

                .isFalse();

    }



    @Test

    public void isAvailable_throwException_shouldReturnFalse() {

        when(mActivity.getSystemService(Context.WIFI_P2P_SERVICE))

                .thenThrow(new IllegalStateException());



        assertThat(WifiDisplaySettings.isAvailable(mActivity))

                .isFalse();

    }



    @Test