Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_…

…parent/master
smartdevicelink · Oct 23, 2014 · 8c1c468 · 8c1c468
2 parents e05905c + e79f015
commit 8c1c468
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ClusterModeStatus.java
@@ -26,7 +26,7 @@ public void setPowerModeActive(Boolean powerModeActive) {
 	    public Boolean getPowerModeActive() {
 	        return (Boolean) store.get(Names.powerModeActive);
 	    }
-	    public void setPowerModeQualificationStatus(Names powerModeQualificationStatus) {
+	    public void setPowerModeQualificationStatus(PowerModeQualificationStatus powerModeQualificationStatus) {
 	        if (powerModeQualificationStatus != null) {
 	            store.put(Names.powerModeQualificationStatus, powerModeQualificationStatus);
 	        } else {

diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
@@ -124,17 +124,17 @@ public void setTextFields( Vector<TextField> textFields ) {
 
 
 
-    public Vector<TextField> getImageFields() {
+    public Vector<ImageField> getImageFields() {
         if (store.get(Names.imageFields) instanceof Vector<?>) {
 	    	Vector<?> list = (Vector<?>)store.get(Names.imageFields);
 	        if (list != null && list.size() > 0) {
 	            Object obj = list.get(0);
-	            if (obj instanceof TextField) {
-	                return (Vector<TextField>) list;
+	            if (obj instanceof ImageField) {
+	                return (Vector<ImageField>) list;
 	            } else if (obj instanceof Hashtable) {
-	                Vector<TextField> newList = new Vector<TextField>();
+	                Vector<ImageField> newList = new Vector<ImageField>();
 	                for (Object hashObj : list) {
-	                    newList.add(new TextField((Hashtable)hashObj));
+	                    newList.add(new ImageField((Hashtable)hashObj));
 	                }
 	                return newList;
 	            }
@@ -143,7 +143,7 @@ public Vector<TextField> getImageFields() {
         return null;
     }
 
-    public void setImageFields( Vector<TextField> imageFields ) {
+    public void setImageFields( Vector<ImageField> imageFields ) {
         if (imageFields != null) {
             store.put(Names.imageFields, imageFields );
         }

diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Show.java
@@ -382,7 +382,7 @@ public void setSecondaryGraphic(Image secondaryGraphic) {
     }
 
 
-    public Image setSecondaryGraphic() {
+    public Image getSecondaryGraphic() {
     	Object obj = parameters.get(Names.secondaryGraphic);
         if (obj instanceof Image) {
             return (Image) obj;