commit 9cb97c44eefff70fd0fc1c1b8dd7ba87f15ba9e6
author Ryan PC Gibson <ryanpc@google.com> Tue Aug 30 09:04:44 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 30 09:04:44 2011 -0700
tree 7b3b2187bfff6f4bdc1c22737d5c5c0708579071
parent a18484fb3819feac248255d6ce509049330aca1b
parent ba69d3bd7d0d73296283e44785dd622324662054

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

src/com/android/settings/bluetooth/BluetoothPermissionRequest.java

diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 797eff7..78617c4 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -36,6 +36,7 @@
 
     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 @@
         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 @@
                 // "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),