summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2009-12-08 14:05:39 -0500
committerDaniel Sandler <dsandler@android.com>2009-12-08 14:06:31 -0500
commit3d22e1825b86567048117207ee0654d59fef69a6 (patch)
tree05ac85680b406803f22292937cc7abe1054b8726
parent97467c6fd99f67bb0a7024533ea8cc1626c41ac8 (diff)
downloadbase-3d22e1825b86567048117207ee0654d59fef69a6.tar.gz
Prevent NPE in recent apps dialog.
Bug: 2284111
-rw-r--r--phone/com/android/internal/policy/impl/RecentApplicationsDialog.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/phone/com/android/internal/policy/impl/RecentApplicationsDialog.java b/phone/com/android/internal/policy/impl/RecentApplicationsDialog.java
index 4c46be5..c5aafa5 100644
--- a/phone/com/android/internal/policy/impl/RecentApplicationsDialog.java
+++ b/phone/com/android/internal/policy/impl/RecentApplicationsDialog.java
@@ -110,8 +110,11 @@ public class RecentApplicationsDialog extends Dialog implements OnClickListener
if (b == v) {
// prepare a launch intent and send it
Intent intent = (Intent)b.getTag();
- intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY);
- getContext().startActivity(intent);
+ if (intent != null) {
+ intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY);
+ getContext().startActivity(intent);
+ }
+ break;
}
}
dismiss();