Fix p2p settings NPE
Bug: 6138959 Change-Id: I0c930686220ad8a77e3a998a108158b2467b5707
This commit is contained in:
@@ -161,6 +161,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
|
||||
}
|
||||
};
|
||||
|
||||
setHasOptionsMenu(true);
|
||||
|
||||
final PreferenceScreen preferenceScreen = getPreferenceScreen();
|
||||
preferenceScreen.removeAll();
|
||||
|
||||
@@ -168,7 +170,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
|
||||
mThisDevicePref = new Preference(getActivity());
|
||||
preferenceScreen.addPreference(mThisDevicePref);
|
||||
|
||||
setHasOptionsMenu(true);
|
||||
mPeersGroup = new PreferenceCategory(getActivity());
|
||||
mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -310,11 +313,8 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
|
||||
preferenceScreen.removeAll();
|
||||
|
||||
preferenceScreen.setOrderingAsAdded(true);
|
||||
mThisDevicePref = new Preference(getActivity());
|
||||
preferenceScreen.addPreference(mThisDevicePref);
|
||||
|
||||
mPeersGroup = new PreferenceCategory(getActivity());
|
||||
mPeersGroup.setTitle(R.string.wifi_p2p_peer_devices);
|
||||
mPeersGroup.setEnabled(true);
|
||||
preferenceScreen.addPreference(mPeersGroup);
|
||||
|
||||
|
Reference in New Issue
Block a user