Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding null check for invalid activity" into nyc-dev

Browse Source
This commit is contained in:
Winson Chung
2016-02-16 17:32:35 +00:00
committed by Android (Google) Code Review
parent 8da2bf4946 59e18729f0
commit bc56ca34aa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoadPlan.java
View File

@@ -18,6 +18,7 @@ package com.android.systemui.recents.model;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.res.Resources; import android.content.res.Resources;
@@ -180,6 +181,7 @@ public class RecentsTaskLoadPlan {
} }
// Load the title, icon, and color // Load the title, icon, and color
ActivityInfo info = loader.getAndUpdateActivityInfo(taskKey);
String title = loader.getAndUpdateActivityTitle(taskKey, t.taskDescription); String title = loader.getAndUpdateActivityTitle(taskKey, t.taskDescription);
String contentDescription = loader.getAndUpdateContentDescription(taskKey, res); String contentDescription = loader.getAndUpdateContentDescription(taskKey, res);
String dismissDescription = dismissDescFormatter.format(dismissDescFormat, String dismissDescription = dismissDescFormatter.format(dismissDescFormat,
@@ -190,8 +192,8 @@ public class RecentsTaskLoadPlan {
Bitmap thumbnail = loader.getAndUpdateThumbnail(taskKey, false); Bitmap thumbnail = loader.getAndUpdateThumbnail(taskKey, false);
int activityColor = loader.getActivityPrimaryColor(t.taskDescription); int activityColor = loader.getActivityPrimaryColor(t.taskDescription);
int backgroundColor = loader.getActivityBackgroundColor(t.taskDescription); int backgroundColor = loader.getActivityBackgroundColor(t.taskDescription);
boolean isSystemApp = (loader.getAndUpdateActivityInfo(taskKey).applicationInfo.flags boolean isSystemApp = (info != null) &&
& ApplicationInfo.FLAG_SYSTEM) != 0; ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
// Add the task to the stack // Add the task to the stack
Task task = new Task(taskKey, t.affiliatedTaskId, t.affiliatedTaskColor, icon, Task task = new Task(taskKey, t.affiliatedTaskId, t.affiliatedTaskColor, icon,