diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-09-23 12:52:19 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-09-23 12:53:34 -0700 |
| commit | 8da429e80d1778d7bcfbfbd64355c70fb466b3ce (patch) | |
| tree | ddcb30f975b92b68ae9850819ddb9760779032bc /packages | |
| parent | c9e94ea6451958fce107580b54c183181de6aa22 (diff) | |
| download | frameworks_base-8da429e80d1778d7bcfbfbd64355c70fb466b3ce.zip frameworks_base-8da429e80d1778d7bcfbfbd64355c70fb466b3ce.tar.gz frameworks_base-8da429e80d1778d7bcfbfbd64355c70fb466b3ce.tar.bz2 | |
Fix issue #7209355, #7214271.
Issue #7209355: Intent on the secondary user results in an intent picker
in the Primary user.
Issue #7214271: Crash in system UI
Also fix a bug where I recently broke the removeTask() operation in the
activity manager where it would remove the wrong task.
Change-Id: I448c73a0e83a78d9d8d96b4629658c169888d275
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 0caa671..5296ae9 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -538,12 +538,14 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener } private void updateUiElements() { - final int items = mRecentTaskDescriptions.size(); + final int items = mRecentTaskDescriptions != null + ? mRecentTaskDescriptions.size() : 0; mRecentsContainer.setVisibility(items > 0 ? View.VISIBLE : View.GONE); // Set description for accessibility - int numRecentApps = mRecentTaskDescriptions.size(); + int numRecentApps = mRecentTaskDescriptions != null + ? mRecentTaskDescriptions.size() : 0; String recentAppsAccessibilityDescription; if (numRecentApps == 0) { recentAppsAccessibilityDescription = |