Merge "Fix possible NPE on People" into ics-mr1
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 031f0c8..5afcbbd 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -472,12 +472,15 @@
@Override
protected void onDestroy() {
- // mActionBarAdapter will be null here when redirecting to another activity in
- // configureContentView().
+ // Some of variables will be null if this Activity redirects Intent.
+ // See also onCreate() or other methods called during the Activity's initialization.
if (mActionBarAdapter != null) {
mActionBarAdapter.setListener(null);
}
- mContactListFilterController.removeListener(this);
+ if (mContactListFilterController != null) {
+ mContactListFilterController.removeListener(this);
+ }
+
super.onDestroy();
}