diff options
| author | ztenghui <ztenghui@google.com> | 2013-06-25 00:32:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-25 00:32:16 +0000 |
| commit | 22b8228415284ad40cad8d5413e030a8ef396b7a (patch) | |
| tree | 9afbc743ea1b770c86271b62747a98a2c4a11353 /src | |
| parent | 957584d0f4bb5e16b4ca9cfef525194f0110d28b (diff) | |
| parent | 1c4707a192c2f58b909a40b2cb24e38571c0e2d7 (diff) | |
| download | android_packages_apps_Snap-22b8228415284ad40cad8d5413e030a8ef396b7a.tar.gz android_packages_apps_Snap-22b8228415284ad40cad8d5413e030a8ef396b7a.tar.bz2 android_packages_apps_Snap-22b8228415284ad40cad8d5413e030a8ef396b7a.zip | |
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index c95a15a99..9d103d590 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -17,6 +17,7 @@ package com.android.gallery3d.filtershow.filters; import android.util.Log; + import com.android.gallery3d.filtershow.editors.BasicEditor; public class FilterRepresentation implements Cloneable { @@ -229,7 +230,7 @@ public class FilterRepresentation implements Cloneable { public void deSerializeRepresentation(String[][] rep) { for (int i = 0; i < rep.length; i++) { if ("Name".equals(rep[i][0])) { - mName = rep[i][0]; + mName = rep[i][1]; break; } } |