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

Commit 52127644 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Merge "Revert "Don\'t use file ID of the removed photo"" into nyc-dev 

am: 0488c3d8

* commit '0488c3d8':
  Revert "Don't use file ID of the removed photo"

Change-Id: Ifbdb9af436ddde7fb70fc6d718338ef27d558efd
parents cc1f61f1 0488c3d8

src/com/android/contacts/editor/EditorUiUtils.java

+1 −3
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ public class EditorUiUtils { 
    /** Returns the {@link Photo#PHOTO_FILE_ID} from the given ValuesDelta. */

    public static Long getPhotoFileId(ValuesDelta valuesDelta) {

        if (valuesDelta == null) return null;

        // 1. There's no "after", we want to obtain the value of Photo.PHOTO_FILE_ID from "before".

        // 2. There's a "after", we want to obtain the value of Photo.PHOTO_FILE_ID from "after".

        if (valuesDelta.getAfter().size() == 0 || valuesDelta.getAfter().get(Photo.PHOTO) != null) {

        if (valuesDelta.getAfter() == null || valuesDelta.getAfter().get(Photo.PHOTO) == null) {

            return valuesDelta.getAsLong(Photo.PHOTO_FILE_ID);

        }

        return null;