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

Commit 1c06ce7b authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Fix NPEs when contact is null 

Fix NPEs in createLauncherShortcutWithContact and deleteContact.

Bug:20757451
Change-Id: Ib55789f2a54d5cab9fe269aa4d4f8c6858ed8806
parent ac48ce4d

src/com/android/contacts/quickcontact/QuickContactActivity.java

+8 −3
Original line number Diff line number Diff line
@@ -2317,7 +2317,8 @@ public class QuickContactActivity extends ContactsActivity { 
    }



    private boolean isShortcutCreatable() {

        if (mContactData == null || mContactData.isUserProfile()) {

        if (mContactData == null || mContactData.isUserProfile() ||

                mContactData.isDirectoryEntry()) {

            return false;

        }

        final Intent createShortcutIntent = new Intent();
@@ -2440,7 +2441,9 @@ public class QuickContactActivity extends ContactsActivity { 
                }

                return true;

            case R.id.menu_delete:

                if (isContactEditable()) {

                    deleteContact();

                }

                return true;

            case R.id.menu_share:

                if (isContactShareable()) {
@@ -2448,7 +2451,9 @@ public class QuickContactActivity extends ContactsActivity { 
                }

                return true;

            case R.id.menu_create_contact_shortcut:

                if (isShortcutCreatable()) {

                    createLauncherShortcutWithContact();

                }

                return true;

            case R.id.menu_help:

                HelpUtils.launchHelpAndFeedbackForContactScreen(this);