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

Commit 7a4b7090 authored by yueg's avatar yueg Committed by Eric Erfanian
Browse files

Fix NPE in PhoneFavoriteTileView.onClick. 

Although we don't know the reason why v.getParent() can be null, we can avoid calling it.

Test: manual
PiperOrigin-RevId: 161442696
Change-Id: I07af0da9b64fb3fa77b01c0b619837a79d593b67
parent b63f4ccc

java/com/android/dialer/app/list/PhoneFavoriteTileView.java

+6 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
  private String mPhoneNumberString;

  private boolean isPinned;

  private boolean isStarred;

  private int position = -1;



  public PhoneFavoriteTileView(Context context, AttributeSet attrs) {

    super(context, attrs);
@@ -126,8 +127,7 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
        CallSpecificAppData.Builder callSpecificAppData =

            CallSpecificAppData.newBuilder()

                .setCallInitiationType(CallInitiationType.Type.SPEED_DIAL)

                .setSpeedDialContactPosition(

                    ((PhoneFavoriteListView) v.getParent()).getPositionForView(v));

                .setSpeedDialContactPosition(position);

        if (isStarred) {

          callSpecificAppData.addSpeedDialContactType(SpeedDialContactType.Type.STARRED_CONTACT);

        } else {
@@ -182,4 +182,8 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
    // Unlike Contacts' tiles, the Dialer's favorites tiles are square.

    return false;

  }



  public void setPosition(int position) {

    this.position = position;

  }

}

java/com/android/dialer/app/list/PhoneFavoritesTileAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements OnDragDrop 
    tileView.setPhotoManager(mPhotoManager);

    tileView.setListener(mListener);

    tileView.loadFromContact(getItem(position));

    tileView.setPosition(position);

    return tileView;

  }