Fixed settings crash fix when profile is connected, Bluetooth turned off/of and phone is rebooted

Change-Id: I8738569c24a3c6cc9166b38719c1e918d990242c
This commit is contained in:
fredc
2012-05-08 17:56:24 -07:00
committed by Matthew Xie
parent 2ac143fff7
commit 654a3ab77d
4 changed files with 99 additions and 26 deletions

View File

@@ -16,11 +16,13 @@
package com.android.settings.bluetooth;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothInputDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.util.Log;
import com.android.settings.R;
@@ -30,8 +32,11 @@ import java.util.List;
* HidProfile handles Bluetooth HID profile.
*/
final class HidProfile implements LocalBluetoothProfile {
private static final String TAG = "HidProfile";
private static boolean V = true;
private BluetoothInputDevice mService;
private boolean mProfileReady;
private boolean mIsProfileReady;
static final String NAME = "HID";
@@ -43,16 +48,21 @@ final class HidProfile implements LocalBluetoothProfile {
implements BluetoothProfile.ServiceListener {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
if (V) Log.d(TAG,"Bluetooth service connected");
mService = (BluetoothInputDevice) proxy;
mProfileReady = true;
mIsProfileReady=true;
}
public void onServiceDisconnected(int profile) {
mProfileReady = false;
mService = null;
if (V) Log.d(TAG,"Bluetooth service disconnected");
mIsProfileReady=false;
}
}
public boolean isProfileReady() {
return mIsProfileReady;
}
HidProfile(Context context, LocalBluetoothAdapter adapter) {
adapter.getProfileProxy(context, new InputDeviceServiceListener(),
BluetoothProfile.INPUT_DEVICE);
@@ -100,10 +110,6 @@ final class HidProfile implements LocalBluetoothProfile {
}
}
public boolean isProfileReady() {
return mProfileReady;
}
public String toString() {
return NAME;
}
@@ -149,4 +155,16 @@ final class HidProfile implements LocalBluetoothProfile {
return R.drawable.ic_bt_misc_hid;
}
}
protected void finalize() {
if (V) Log.d(TAG, "finalize()");
if (mService != null) {
try {
BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.INPUT_DEVICE, mService);
mService = null;
}catch (Throwable t) {
Log.w(TAG, "Error cleaning up HID proxy", t);
}
}
}
}