7d701174f423754a2dade39fd16f102c085bd865 - platform/frameworks/base

commit	7d701174f423754a2dade39fd16f102c085bd865	[log] [tgz]
author	Wale Ogunwale <ogunwale@google.com>	Wed Mar 11 15:36:30 2015 -0700
committer	Wale Ogunwale <ogunwale@google.com>	Thu Mar 12 15:03:22 2015 -0700
tree	9f17d8c6daa09c1e2c1ac06d582fa0fc95389bcc
parent	04f4d6bb8892fe9b6e8f60d18a4f4dd051ab8124 [diff]

Protect against NPE for ActivityRecords without a stack.

A previous change allowed us to remove stack that no longer contained
any task. This was causing some NPE when an ActivityRecord.Token or
some other cached ActivityRecord later gets converted back to an
ActivityRecord and we try to access its stack.

Bug: 19552874
Change-Id: Ie9454bbce56591b337f97af40f8c00b8597becdf

services/core/java/com/android/server/am/ActivityManagerService.java[diff]
services/core/java/com/android/server/am/ActivityRecord.java[diff]
services/core/java/com/android/server/am/ActivityStack.java[diff]
services/core/java/com/android/server/am/ActivityStackSupervisor.java[diff]
services/core/java/com/android/server/am/PendingIntentRecord.java[diff]
services/core/java/com/android/server/am/TaskRecord.java[diff]

6 files changed

tree: 9f17d8c6daa09c1e2c1ac06d582fa0fc95389bcc