diff options
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java index d358b8c22..ed1e251ea 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java @@ -67,6 +67,14 @@ public class BluetoothOppLauncherActivity extends Activity { Intent intent = getIntent(); String action = intent.getAction(); + if (action == null) { + /* + * If an invalid intent without action is set (example: File Manager) + * we should not die because of a NPE + */ + return; + } + if (action.equals(Intent.ACTION_SEND) || action.equals(Intent.ACTION_SEND_MULTIPLE)) { /* * Other application is trying to share a file via Bluetooth, |