summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-06-25 00:32:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-25 00:32:16 +0000
commitc309cd0b01c5f254c29f7195c8f7f62ea19381d6 (patch)
tree38a194ade41c010209e84eed4357d347cf40c4f4
parent4956b8e60bfb860f76f22d449ee0d0c0d0cbaf4a (diff)
parentb449c9cbe6e38bc1d169fd0cad20600b333b5bc8 (diff)
downloadandroid_packages_apps_Snap-c309cd0b01c5f254c29f7195c8f7f62ea19381d6.tar.gz
android_packages_apps_Snap-c309cd0b01c5f254c29f7195c8f7f62ea19381d6.tar.bz2
android_packages_apps_Snap-c309cd0b01c5f254c29f7195c8f7f62ea19381d6.zip
Merge "Fix the missing filter name after deserialization." into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java3
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;
}
}