Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev

This commit is contained in:
PauloftheWest
2014-09-02 18:11:37 +00:00
committed by Android (Google) Code Review

View File

@@ -271,10 +271,14 @@ class AccessPoint extends Preference {
// set the icon (drawable) to that state's drawable.
StateListDrawable sld = (StateListDrawable) context.getTheme()
.obtainStyledAttributes(wifi_signal_attributes).getDrawable(0);
// If sld is null then we are indexing and therefore do not have access to
// (nor need to display) the drawable.
if (sld != null) {
sld.setState((security != SECURITY_NONE) ? STATE_SECURED : STATE_NONE);
drawable = sld.getCurrent();
setIcon(drawable);
}
}
if (drawable != null) {
drawable.setLevel(level);