PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "2nd attempt to fix crash when getting unavailable service" am: ec4e0d3008 am: a9cb8d776b

Browse Source 
am: c1968ab9a0

Change-Id: Id2a769571957c59a209263432256f77a190b68e0
This commit is contained in:
Fan Zhang
2018-01-24 23:01:57 +00:00
committed by android-build-merger
parent 8b2f6e3edb c1968ab9a0
commit c9afb5915c
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.database.ContentObserver;
import android.hardware.display.DisplayManager;
import android.hardware.display.WifiDisplay;
@@ -218,13 +219,9 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
}
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;
}
return context.getSystemService(Context.DISPLAY_SERVICE) != null
&& context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)
&& context.getSystemService(Context.WIFI_P2P_SERVICE) != null;
}
private void scheduleUpdate(int changes) {

13
tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
View File

@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.display.DisplayManager;
import android.media.MediaRouter;
import android.net.wifi.p2p.WifiP2pManager;
@@ -50,6 +51,8 @@ public class WifiDisplaySettingsTest {
private SummaryLoader mSummaryLoader;
@Mock
private MediaRouter mMediaRouter;
@Mock
private PackageManager mPackageManager;
private SummaryLoader.SummaryProvider mSummaryProvider;
@@ -58,6 +61,8 @@ public class WifiDisplaySettingsTest {
MockitoAnnotations.initMocks(this);
when(mActivity.getSystemService(Context.MEDIA_ROUTER_SERVICE))
.thenReturn(mMediaRouter);
when(mActivity.getPackageManager()).thenReturn(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
mSummaryProvider = WifiDisplaySettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(
mActivity, mSummaryLoader);
@@ -86,15 +91,15 @@ public class WifiDisplaySettingsTest {
}
@Test
public void isAvailable_noService_shouldReturnFalse() {
public void isAvailable_nullService_shouldReturnFalse() {
assertThat(WifiDisplaySettings.isAvailable(mActivity))
.isFalse();
}
@Test
public void isAvailable_throwException_shouldReturnFalse() {
when(mActivity.getSystemService(Context.WIFI_P2P_SERVICE))
.thenThrow(new IllegalStateException());
public void isAvailable_noWifiDirectFeature_shouldReturnFalse() {
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT))
.thenReturn(false);
assertThat(WifiDisplaySettings.isAvailable(mActivity))
.isFalse();