am a547bb99: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev

* commit 'a547bb9940e38c6dd60eb998f17a17c26e350bbf':
  Fixed a Null Pointer Error in Bluetooth Settings.
This commit is contained in:
PauloftheWest
2014-09-09 21:56:23 +00:00
committed by Android Git Automerger

View File

@@ -132,8 +132,8 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
public void setDevice(CachedBluetoothDevice cachedDevice) {
mCachedDevice = cachedDevice;
mCachedDevice.registerCallback(this);
if (isResumed()) {
mCachedDevice.registerCallback(this);
addPreferencesForProfiles();
refresh();
}