Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev

This commit is contained in:
PauloftheWest
2014-09-02 21:31:22 +00:00
committed by Android (Google) Code Review
3 changed files with 77 additions and 1 deletions

View File

@@ -393,7 +393,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
}
if (profileFrag == null) {
LayoutInflater inflater = getActivity().getLayoutInflater();
mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_picker, null);
mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_settings, null);
profileFrag = (DeviceProfilesSettings)activity.getFragmentManager()
.findFragmentById(R.id.bluetooth_fragment_settings);
}