Merge "Update saved networks screen after forget." into oc-dev
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 07495ee..1a60256 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -66,6 +66,18 @@
}
};
+ private final WifiManager.ActionListener mForgetListener = new WifiManager.ActionListener() {
+ @Override
+ public void onSuccess() {
+ initPreferences();
+ }
+
+ @Override
+ public void onFailure(int reason) {
+ initPreferences();
+ }
+ };
+
private WifiDialog mDialog;
private WifiManager mWifiManager;
private AccessPoint mDlgAccessPoint;
@@ -229,11 +241,12 @@
Log.e(TAG, "Failed to remove Passpoint configuration for "
+ mSelectedAccessPoint.getConfigName());
}
+ initPreferences();
} else {
- mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, null);
+ // mForgetListener will call initPreferences upon completion
+ mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
}
mSelectedAccessPoint = null;
- initPreferences();
}
}