Skip to content

Commit 029abfd

Browse files
mikejurkaAndroid (Google) Code Review
authored andcommitted
Merge "Fix NPE" into jb-dev
2 parents 2218f6c + a8eac1d commit 029abfd

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,9 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
713713

714714
public void handleSwipe(View view) {
715715
TaskDescription ad = ((ViewHolder) view.getTag()).taskDescription;
716+
if (ad == null) {
717+
Log.v(TAG, "Not able to find activity description for swiped task");
718+
}
716719
if (DEBUG) Log.v(TAG, "Jettison " + ad.getLabel());
717720
mRecentTaskDescriptions.remove(ad);
718721

@@ -727,13 +730,15 @@ public void handleSwipe(View view) {
727730
// the task.
728731
final ActivityManager am = (ActivityManager)
729732
mContext.getSystemService(Context.ACTIVITY_SERVICE);
730-
am.removeTask(ad.persistentTaskId, ActivityManager.REMOVE_TASK_KILL_PROCESS);
733+
if (am != null) {
734+
am.removeTask(ad.persistentTaskId, ActivityManager.REMOVE_TASK_KILL_PROCESS);
731735

732-
// Accessibility feedback
733-
setContentDescription(
734-
mContext.getString(R.string.accessibility_recents_item_dismissed, ad.getLabel()));
735-
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
736-
setContentDescription(null);
736+
// Accessibility feedback
737+
setContentDescription(
738+
mContext.getString(R.string.accessibility_recents_item_dismissed, ad.getLabel()));
739+
sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
740+
setContentDescription(null);
741+
}
737742
}
738743

739744
private void startApplicationDetailsActivity(String packageName) {

0 commit comments

Comments
 (0)