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

Commit a12ac6d6 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Don't use file ID of the removed photo 

Doc https://goto.google.com/removedphoto

Bug 25978539

Change-Id: I77abbc11766a570eb657a3b02ef910b3fa300f45
parent a420c409

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

+3 −1
Original line number Diff line number Diff line
@@ -240,7 +240,9 @@ 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;

        if (valuesDelta.getAfter() == null || valuesDelta.getAfter().get(Photo.PHOTO) == 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) {

            return valuesDelta.getAsLong(Photo.PHOTO_FILE_ID);

        }

        return null;