Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev

Browse Source 
* commit 'cd460538a4e00cd36be478b00d298a6e2526528f':
  Don't send the onServiceDisconnected callback after close.
This commit is contained in:
Andre Eisenbach
2014-12-16 17:21:13 +00:00
committed by Android Git Automerger
parent b1a280a3ee cd460538a4
commit f6b62a9d91
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/bluetooth/BluetoothHeadset.java
View File

@@ -229,7 +229,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
private ServiceListener mServiceListener;
private IBluetoothHeadset mService;
private BluetoothAdapter mAdapter;
private boolean mIsClosed;
final private IBluetoothStateChangeCallback mBluetoothStateChangeCallback =
new IBluetoothStateChangeCallback.Stub() {
@@ -260,7 +259,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
mContext = context;
mServiceListener = l;
mAdapter = BluetoothAdapter.getDefaultAdapter();
mIsClosed = false;
IBluetoothManager mgr = mAdapter.getBluetoothManager();
if (mgr != null) {
@@ -314,7 +312,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
Log.e(TAG,"",e);
}
}
mIsClosed = true;
mServiceListener = null;
doUnbind();
}
@@ -983,9 +981,6 @@ public final class BluetoothHeadset implements BluetoothProfile {
if (mServiceListener != null) {
mServiceListener.onServiceDisconnected(BluetoothProfile.HEADSET);
}
if (mIsClosed){
mServiceListener = null;
}
break;
}
}