add javadocs, add back in startAudioService method to ISDL

4 files changed, 77 insertions, 1 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index cdbfe0c14..a7068e051 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
@@ -201,6 +201,9 @@ public class SystemCapabilityManagerTests extends AndroidTestCase {
 			return null;
 		}
 
+		@Override
+		public void startAudioService(boolean encrypted){}
+
 	}
 
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
index 7ae323dfa..2ea78850a 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
@@ -107,26 +107,46 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
 			sdlManager = new SdlManager();
 		}
 
+		/**
+		 * Sets the App ID
+		 * @param appId
+		 */
 		public Builder setAppId(final String appId){
 			sdlManager.appId = appId;
 			return this;
 		}
 
+		/**
+		 * Sets the Application Name
+		 * @param appName
+		 */
 		public Builder setAppName(final String appName){
 			sdlManager.appName = appName;
 			return this;
 		}
 
+		/**
+		 * Sets the Short Application Name
+		 * @param shortAppName
+		 */
 		public Builder setShortAppName(final String shortAppName) {
 			sdlManager.shortAppName = shortAppName;
 			return this;
 		}
 
+		/**
+		 * Sets if the app is a media app
+		 * @param isMediaApp
+		 */
 		public Builder setIsMediaApp(final Boolean isMediaApp){
 			sdlManager.isMediaApp = isMediaApp;
 			return this;
 		}
 
+		/**
+		 * Sets the Language of the App
+		 * @param hmiLanguage
+		 */
 		public Builder setLanguage(final Language hmiLanguage){
 			sdlManager.hmiLanguage = hmiLanguage;
 			return this;
@@ -137,16 +157,28 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
             return this;
         }*/
 
+		/**
+		 * Sets the vector of HMI Types
+		 * @param hmiTypes
+		 */
 		public Builder setHMITypes(final Vector<AppHMIType> hmiTypes){
 			sdlManager.hmiTypes = hmiTypes;
 			return this;
 		}
 
+		/**
+		 * Sets the vector of vrSynonyms
+		 * @param vrSynonyms
+		 */
 		public Builder setVrSynonyms(final Vector<String> vrSynonyms) {
 			sdlManager.vrSynonyms = vrSynonyms;
 			return this;
 		}
 
+		/**
+		 * Sets the TTS Name
+		 * @param ttsChunks
+		 */
 		public Builder setTtsName(final Vector<TTSChunk> ttsChunks) {
 			sdlManager.ttsChunks = ttsChunks;
 			return this;
@@ -154,12 +186,18 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
 
 		/**
 		 * This Object type may change with the transport refactor
+		 * Sets the BaseTransportConfig
+		 * @param transport
 		 */
 		public Builder setTransportType(BaseTransportConfig transport){
 			sdlManager.transport = transport;
 			return this;
 		}
 
+		/**
+		 * Sets the Context
+		 * @param context
+		 */
 		public Builder setContext(Context context){
 			sdlManager.context = context;
 			return this;
@@ -303,6 +341,13 @@ public class SdlManager implements ProxyBridge.LifecycleListener {
 		}
 
 		@Override
+		public void startAudioService(boolean encrypted) {
+			if(isConnected()){
+				proxy.startService(SessionType.PCM, encrypted);
+			}
+		}
+
+		@Override
 		public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec,
 													 AudioStreamingParams params) {
 			return proxy.startAudioStream(isEncrypted, codec, params);
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index bb1b3add6..f18a3bdad 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -359,6 +359,13 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		}

 

 		@Override

+		public void startAudioService(boolean encrypted) {

+			if(isConnected()){

+				sdlSession.startService(SessionType.PCM,sdlSession.getSessionId(),encrypted);

+			}

+		}

+

+		@Override

 		public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters){

 			return SdlProxyBase.this.startVideoStream(isEncrypted, parameters);

 		}

@@ -602,7 +609,22 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		}

 	}

 

-	// Used by SDLManager

+	/**

+	 * Used by the SdlManager

+	 *

+	 * @param listener Type of listener for this proxy base.

+	 * @param appName Client application name.

+	 * @param shortAppName Client short application name.

+	 * @param isMediaApp Flag that indicates that client application if media application or not.

+	 * @param languageDesired Desired language.

+	 * @param hmiDisplayLanguageDesired Desired language for HMI.

+	 * @param appType Type of application.

+	 * @param appID Application identifier.

+	 * @param transportConfig Configuration of transport to be used by underlying connection.

+	 * @param vrSynonyms List of synonyms.

+	 * @param ttsName TTS name.

+	 * @throws SdlException

+	 */

 	public SdlProxyBase(proxyListenerType listener, String appName,String shortAppName, Boolean isMediaApp, Language languageDesired, Language hmiDisplayLanguageDesired, Vector<AppHMIType> appType, String appID,

 						BaseTransportConfig transportConfig, Vector<String> vrSynonyms, Vector<TTSChunk> ttsName) throws SdlException {

 		performBaseCommon(listener, null, true, appName, ttsName, shortAppName, vrSynonyms, isMediaApp,

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 73a2d346b..eb56aea2f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -100,6 +100,12 @@ public interface ISdl {
     void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params);
 
     /**
+     * Starts the Audio streaming service
+     * @param encrypted flag to start this service with encryption or not
+     */
+    void startAudioService(boolean encrypted);
+
+    /**
      * Stops the audio service if open
      */
     void stopAudioService();