allow getting set of preloaded choices

2 files changed, 14 insertions, 0 deletions

diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
index 381e979e1..207897f69 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java
@@ -56,6 +56,7 @@ import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.util.DebugTool;
 
 import java.lang.ref.WeakReference;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -480,6 +481,13 @@ abstract class BaseScreenManager extends BaseSubManager {
 		this.choiceSetManager.setKeyboardConfiguration(keyboardConfiguration);
 	}
 
+	/**
+	 * @return A set of choice cells that have been preloaded to the head unit
+	 */
+	public HashSet<ChoiceCell> getPreloadedChoices(){
+		return this.choiceSetManager.getPreloadedChoices();
+	}
+
 	// END CHOICE SETS
 
 	/**
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index 465b308a7..e66b286fb 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -360,6 +360,12 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
         }
     }
 
+    // GETTERS
+
+    public HashSet<ChoiceCell> getPreloadedChoices(){
+        return this.preloadedChoices;
+    }
+
     // CHOICE SET MANAGEMENT HELPERS
 
     private HashSet<ChoiceCell> choicesToBeUploadedWithArray(List<ChoiceCell> choices){