Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f745c69c authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Fix possible NPE on People" into ics-mr1

parents 47f0263b b2a23189
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
@@ -472,12 +472,15 @@ public class PeopleActivity extends ContactsActivity

    @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);
        }
        if (mContactListFilterController != null) {
            mContactListFilterController.removeListener(this);
        }

        super.onDestroy();
    }