diff options
author | Michael Jurka <mikejurka@google.com> | 2012-04-30 15:54:19 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-04-30 15:54:28 -0700 |
commit | a8eac1deb5c4d587d28ddcaea9c3ec3007e4639a (patch) | |
tree | 1639333e15edf64954244d51f185b2191f19dc86 /packages/SystemUI/src/com/android/systemui/recent | |
parent | 9e2b578fffee37e717b936d43b52d30b18bf64ce (diff) | |
download | frameworks_base-a8eac1deb5c4d587d28ddcaea9c3ec3007e4639a.zip frameworks_base-a8eac1deb5c4d587d28ddcaea9c3ec3007e4639a.tar.gz frameworks_base-a8eac1deb5c4d587d28ddcaea9c3ec3007e4639a.tar.bz2 |
Fix NPE
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/recent')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index f19ab24..492fe4b 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -713,6 +713,9 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener public void handleSwipe(View view) { TaskDescription ad = ((ViewHolder) view.getTag()).taskDescription; + if (ad == null) { + Log.v(TAG, "Not able to find activity description for swiped task"); + } if (DEBUG) Log.v(TAG, "Jettison " + ad.getLabel()); mRecentTaskDescriptions.remove(ad); @@ -727,13 +730,15 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener // the task. final ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE); - am.removeTask(ad.persistentTaskId, ActivityManager.REMOVE_TASK_KILL_PROCESS); + if (am != null) { + am.removeTask(ad.persistentTaskId, ActivityManager.REMOVE_TASK_KILL_PROCESS); - // Accessibility feedback - setContentDescription( - mContext.getString(R.string.accessibility_recents_item_dismissed, ad.getLabel())); - sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); - setContentDescription(null); + // Accessibility feedback + setContentDescription( + mContext.getString(R.string.accessibility_recents_item_dismissed, ad.getLabel())); + sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); + setContentDescription(null); + } } private void startApplicationDetailsActivity(String packageName) { |