diff options
author | Fan Zhang <zhfan@google.com> | 2018-01-23 13:48:27 -0800 |
---|---|---|
committer | Fan Zhang <zhfan@google.com> | 2018-01-23 13:53:06 -0800 |
commit | 54291e10ceab1368e0eb20b2f4b8fadd8e84f3ca (patch) | |
tree | 5289514b4e0c53c8a3e931686418a50826a98ead /src/com | |
parent | 6e6b1e207953f1dd72be8a3eafa1e3acf77eadc0 (diff) | |
download | packages_apps_Settings-54291e10ceab1368e0eb20b2f4b8fadd8e84f3ca.tar.gz packages_apps_Settings-54291e10ceab1368e0eb20b2f4b8fadd8e84f3ca.tar.bz2 packages_apps_Settings-54291e10ceab1368e0eb20b2f4b8fadd8e84f3ca.zip |
2nd attempt to fix crash when getting unavailable service
Change-Id: I6abb16e1c84b82021ce2dd54097fe68857e69129
Fixes: 68013053
Test: robotests
Diffstat (limited to 'src/com')
-rwxr-xr-x | src/com/android/settings/wfd/WifiDisplaySettings.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 3fe438fda1..67a1e4af94 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -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; @@ -213,13 +214,9 @@ 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; - } + 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) { |