diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-13 16:23:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 16:23:38 -0800 |
| commit | 1fbb5da29a4ebef1d758dffad9c2704a5932d223 (patch) | |
| tree | 24d93cf8324d3e4a263a67778d1727d306263005 /services/java/com/android | |
| parent | 3857dbe11c723795e9456e5934ca3a4a3513e4b7 (diff) | |
| parent | 29bbd570fe36c55321a3cd9d84330dea9d2f1e10 (diff) | |
| download | frameworks_base-1fbb5da29a4ebef1d758dffad9c2704a5932d223.zip frameworks_base-1fbb5da29a4ebef1d758dffad9c2704a5932d223.tar.gz frameworks_base-1fbb5da29a4ebef1d758dffad9c2704a5932d223.tar.bz2 | |
am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev
* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10':
Add null pointer check.
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index fd791f9..0e15261 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -3160,7 +3160,9 @@ final class ActivityStack { final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null; if (task == tr && task.mOnTopOfHome || numTasks <= 1) { - task.mOnTopOfHome = false; + if (task != null) { + task.mOnTopOfHome = false; + } return mStackSupervisor.resumeHomeActivity(null); } |