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

* commit '654517a510dd4f655a468ad0083d04929338a7df':
  Fixed a Null Pointer Error in Bluetooth Settings.
This commit is contained in:
PauloftheWest
2014-09-09 20:52:13 +00:00
committed by Android Git Automerger

View File

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