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

Commit b2a23189 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Fix possible NPE on People 

mContactListFilterController may become null if People app just
redirects Intents to somewhere else (like contacts detail page).

Bug: 5557277
Change-Id: I3b1859ec3cd8f85a9ced0c926f7335772b03f70c
parent 57f61c89

src/com/android/contacts/activities/PeopleActivity.java

+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();

    }