am 98f61b71: Merge "Fixed a crash when sharing video through Bluetooth." into lmp-dev

* commit '98f61b71ac182d87256ea21e770b57c1168d1472':
  Fixed a crash when sharing video through Bluetooth.
This commit is contained in:
PauloftheWest
2014-08-21 16:31:05 +00:00
committed by Android Git Automerger

View File

@@ -58,8 +58,6 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
private static final String KEY_UNPAIR = "unpair"; private static final String KEY_UNPAIR = "unpair";
private static final String KEY_PBAP_SERVER = "PBAP Server"; private static final String KEY_PBAP_SERVER = "PBAP Server";
public static final String EXTRA_DEVICE = "device";
private CachedBluetoothDevice mCachedDevice; private CachedBluetoothDevice mCachedDevice;
private LocalBluetoothManager mManager; private LocalBluetoothManager mManager;
private LocalBluetoothProfileManager mProfileManager; private LocalBluetoothProfileManager mProfileManager;
@@ -102,7 +100,6 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putParcelable(EXTRA_DEVICE, mCachedDevice.getDevice());
} }
@Override @Override