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

Merge "Catch NPE on network state and fall back to empty summary." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-18 21:27:44 +00:00
committed by Android (Google) Code Review
parent 212a6f264f 6acb76621d
commit 964874e444
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() {
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() {
@@ -798,7 +802,10 @@ public class AccessPoint implements Comparable<AccessPoint> {
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)
? R.array.wifi_status : R.array.wifi_status_with_ssid);
int index = state.ordinal();