summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2012-05-31 15:04:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-31 15:04:53 -0700
commitc26c2f22042b676539f664002ec51ce78d276b62 (patch)
tree193bc664e76173008c7b20dd59a607916ada49c6 /src/com/android/settings/wifi
parent5388bc88bdf045a461c52856e9bc2de9f1664acf (diff)
parenta9d76b3bcccb6ca5837efe53f2c7e5b880404c15 (diff)
downloadpackages_apps_settings-c26c2f22042b676539f664002ec51ce78d276b62.zip
packages_apps_settings-c26c2f22042b676539f664002ec51ce78d276b62.tar.gz
packages_apps_settings-c26c2f22042b676539f664002ec51ce78d276b62.tar.bz2
Merge "Fetch peers after preferenceScreen is ready" into jb-dev
Diffstat (limited to 'src/com/android/settings/wifi')
-rw-r--r--src/com/android/settings/wifi/p2p/WifiP2pSettings.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index c181db9..684ec30 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -249,7 +249,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
public void onResume() {
super.onResume();
getActivity().registerReceiver(mReceiver, mIntentFilter);
- mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
}
@Override
@@ -435,6 +434,9 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
mPeersGroup.setEnabled(true);
preferenceScreen.addPreference(mPeersGroup);
+
+ /* Request latest set of peers */
+ mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
}
}