From 6271cd01de0c22407d5d83e485e719e40cf57c50 Mon Sep 17 00:00:00 2001
From: Yuhao Zheng <yuhaozheng@google.com>
Date: Mon, 7 Oct 2013 12:30:49 -0700
Subject: [PATCH] Fix NPE in Wi-Fi Direct Setting UI

After a PreferenceGroup is created, attach it to a PreferenceScreen right away.
Otherwise, if PreferenceGroup.addPreference is accidentally called before being
attached, it will result in an NPE and a UI crash.

Bug: 11050625
Change-Id: I68fa8b67ab807c0729c43c1b5cdabdbcd4f2c230
---
 src/com/android/settings/wifi/p2p/WifiP2pSettings.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index cd1d721712c..1902c9f65ea 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -305,9 +305,11 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
 
         mPeersGroup = new PreferenceCategory(getActivity());
         mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
+        preferenceScreen.addPreference(mPeersGroup);
 
         mPersistentGroup = new PreferenceCategory(getActivity());
         mPersistentGroup.setTitle(R.string.wifi_p2p_remembered_groups);
+        preferenceScreen.addPreference(mPersistentGroup);
 
         super.onActivityCreated(savedInstanceState);
     }