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

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

Browse Source
This commit is contained in:
Ryan PC Gibson
2011-08-30 09:04:44 -07:00
committed by Android (Google) Code Review
parent a18484fb38 ba69d3bd7d
commit 9cb97c44ee
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 String TAG = "BluetoothPermissionRequest";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private BluetoothDevice mDevice;
public static final int NOTIFICATION_ID = android.R.drawable.stat_sys_data_bluetooth; 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)) { if (action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context); LocalBluetoothManager localManager = LocalBluetoothManager.getInstance(context);
// convert broadcast intent into activity intent (same action string) // convert broadcast intent into activity intent (same action string)
BluetoothDevice device = mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
Intent connectionAccessIntent = new Intent(action); Intent connectionAccessIntent = new Intent(action);
connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class); connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
connectionAccessIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); 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 powerManager =
(PowerManager) context.getSystemService(Context.POWER_SERVICE); (PowerManager) context.getSystemService(Context.POWER_SERVICE);
@@ -71,12 +71,13 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
// "Clear All Notifications" button // "Clear All Notifications" button
Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY); Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT, deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
BluetoothDevice.CONNECTION_ACCESS_NO); BluetoothDevice.CONNECTION_ACCESS_NO);
Notification notification = new Notification(android.R.drawable.stat_sys_data_bluetooth, Notification notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
context.getString(R.string.bluetooth_connection_permission_request), System.currentTimeMillis()); 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, notification.setLatestEventInfo(context,
context.getString(R.string.bluetooth_connection_permission_request), context.getString(R.string.bluetooth_connection_permission_request),
context.getString(R.string.bluetooth_connection_notif_message, deviceName), context.getString(R.string.bluetooth_connection_notif_message, deviceName),