commit 0488c3d83099c4d82f5ddc41c045bc7b7833de29
author Wenyi Wang <wenyiw@google.com> Wed Mar 30 01:37:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 01:37:25 2016 +0000
tree da843076f3797ee72e6577ea84cb510bfd1077cd
parent 9b86e305a777da231e60df3e482020e5198cc5d1
parent 2a4848adcae11e3ee3d5483268d251cccc043e33

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

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

diff --git a/src/com/android/contacts/editor/EditorUiUtils.java b/src/com/android/contacts/editor/EditorUiUtils.java
index b87d4f4..a513be5 100644
--- a/src/com/android/contacts/editor/EditorUiUtils.java
+++ b/src/com/android/contacts/editor/EditorUiUtils.java
@@ -240,9 +240,7 @@
     /** 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;