Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch NPE on network state and fall back to empty summary.

Browse Source 
Bug: 32171456
Change-Id: Ia3c1e1f5b7848ec914be9f92401a02b50df1dc57
This commit is contained in:
Fan Zhang
2016-10-17 12:40:03 -07:00
parent 8e10f945bd
commit 6acb76621d
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -356,7 +356,11 @@ public class AccessPoint implements Comparable<AccessPoint> {
} }
public DetailedState getDetailedState() { public DetailedState getDetailedState() {
return mNetworkInfo != null ? mNetworkInfo.getDetailedState() : null; if (mNetworkInfo != null) {
return mNetworkInfo.getDetailedState();
}
Log.w(TAG, "NetworkInfo is null, cannot return detailed state");
return null;
} }
public String getSavedNetworkSummary() { public String getSavedNetworkSummary() {
@@ -798,7 +802,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
return context.getString(R.string.wifi_connected_no_internet); return context.getString(R.string.wifi_connected_no_internet);
} }
} }
if (state == null) {
Log.w(TAG, "state is null, returning empty summary");
return "";
}
String[] formats = context.getResources().getStringArray((ssid == null) String[] formats = context.getResources().getStringArray((ssid == null)
? R.array.wifi_status : R.array.wifi_status_with_ssid); ? R.array.wifi_status : R.array.wifi_status_with_ssid);
int index = state.ordinal(); int index = state.ordinal();