PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread

Browse Source 
* commit '9cb97c44eefff70fd0fc1c1b8dd7ba87f15ba9e6':
  DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
This commit is contained in:
Ryan PC Gibson
2011-08-30 09:07:39 -07:00
committed by Android Git Automerger
parent d7d6c7ffad 9cb97c44ee
commit 9fe3630270
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -36,6 +36,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
private static final String TAG = "BluetoothPermissionRequest";
private static final boolean DEBUG = false;
private BluetoothDevice mDevice;
public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth;
@@ -48,15 +49,14 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context);
// convert broadcast intent into activity intent (same action string)
BluetoothDevice device =
intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
Intent connectionAccessIntent = new Intent(action);
connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
connectionAccessIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
String deviceAddress = device != null ? device.getAddress() : null;
String deviceAddress = mDevice != null ? mDevice.getAddress() : null;
PowerManager powerManager =
(PowerManager) context.getSystemService(Context.POWER_SERVICE);
@@ -71,12 +71,13 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
// "Clear All Notifications" button
Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
BluetoothDevice.CONNECTION_ACCESS_NO);
Notification notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
context.getString(R.string.bluetooth_connection_permission_request), System.currentTimeMillis());
String deviceName = device != null ? device.getName() : null;
String deviceName = mDevice != null ? mDevice.getName() : null;
notification.setLatestEventInfo(context,
context.getString(R.string.bluetooth_connection_permission_request),
context.getString(R.string.bluetooth_connection_notif_message, deviceName),