Merge pull request #1447 from smartdevicelink/feature/issue_1446_remove_deprecated_rpcs

Remove deprecated RPC APIs that don't exist in the spec

49 files changed, 390 insertions, 1727 deletions

diff --git a/android/sdl_android/src/androidTest/assets/json/StreamRPC.json b/android/sdl_android/src/androidTest/assets/json/StreamRPC.json
deleted file mode 100644
index ff20ffc93..000000000
--- a/android/sdl_android/src/androidTest/assets/json/StreamRPC.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "response":{
-    "name":"StreamRPCResponse",
-    "correlationID":198,
-    "parameters":{
-      "fileName":"test",
-      "fileSize":100
-    }
-  }
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java
index 744779ef4..d8bf8422a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java
@@ -40,10 +40,6 @@ public class RpcConverterTest {
                 case ENCODED_SYNC_P_DATA:
                 case ON_ENCODED_SYNC_P_DATA:
                 case GENERIC_RESPONSE:
-                case STREAM_RPC:
-                case ON_LOCK_SCREEN_STATUS:
-                case ON_SDL_CHOICE_CHOSEN:
-                case ON_STREAM_RPC:
                     continue;
                 default:
 
@@ -70,10 +66,6 @@ public class RpcConverterTest {
                 case ENCODED_SYNC_P_DATA:
                 case ON_ENCODED_SYNC_P_DATA:
                 case GENERIC_RESPONSE:
-                case STREAM_RPC:
-                case ON_LOCK_SCREEN_STATUS:
-                case ON_SDL_CHOICE_CHOSEN:
-                case ON_STREAM_RPC:
                     return null;
                 case SHOW_CONSTANT_TBT:
                     rpcClassName.append("ShowConstantTbt");
@@ -109,10 +101,6 @@ public class RpcConverterTest {
                 case ENCODED_SYNC_P_DATA:
                 case ON_ENCODED_SYNC_P_DATA:
                 case GENERIC_RESPONSE:
-                case STREAM_RPC:
-                case ON_LOCK_SCREEN_STATUS:
-                case ON_SDL_CHOICE_CHOSEN:
-                case ON_STREAM_RPC:
                     continue;
                 default:
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
deleted file mode 100644
index 082c87fda..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.smartdevicelink.test.proxy;
-
-import com.smartdevicelink.proxy.LockScreenManager;
-import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;
-import com.smartdevicelink.proxy.rpc.enums.HMILevel;
-import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.LockScreenManager}
- */
-public class LockScreenManagerTest extends TestCase {
-
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.LockScreenManager#setDriverDistStatus(boolean)}
-	 */
-    public void testDriverDistStatus(){
-        LockScreenManager lockMan = new LockScreenManager();
-        lockMan.setDriverDistStatus(true);
-        assertEquals(TestValues.MATCH, true, (boolean) lockMan.getLockObj().getDriverDistractionStatus());
-
-        lockMan.setDriverDistStatus(false);
-        assertEquals(TestValues.MATCH, false, (boolean) lockMan.getLockObj().getDriverDistractionStatus());
-    }
-
-    /**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.LockScreenManager#setHMILevel(HMILevel)}
-	 */
-    public void testHmiLevelStatus(){
-        LockScreenManager lockMan = new LockScreenManager();
-        lockMan.setHMILevel(HMILevel.HMI_BACKGROUND);
-        assertEquals(TestValues.MATCH, HMILevel.HMI_BACKGROUND, lockMan.getLockObj().getHMILevel());
-
-        lockMan.setHMILevel(HMILevel.HMI_FULL);
-        assertEquals(TestValues.MATCH, HMILevel.HMI_FULL, lockMan.getLockObj().getHMILevel());
-
-        lockMan.setHMILevel(HMILevel.HMI_LIMITED);
-        assertEquals(TestValues.MATCH, HMILevel.HMI_LIMITED, lockMan.getLockObj().getHMILevel());
-
-        lockMan.setHMILevel(HMILevel.HMI_NONE);
-        assertEquals(TestValues.MATCH, HMILevel.HMI_NONE, lockMan.getLockObj().getHMILevel());
-
-        lockMan.setHMILevel(null);
-        assertNull(TestValues.NULL, lockMan.getLockObj().getHMILevel());
-    }
-
-    /**
-     * Test the lock screen status when no setter methods are called.
-     */
-    public void testLockScreenStatusNull(){
-        LockScreenManager lockMan = new LockScreenManager();
-        OnLockScreenStatus result = lockMan.getLockObj();
-        assertNotNull(TestValues.NOT_NULL, result);
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-    }
-
-    /**
-     * Test the invalid settings of lock screen status.
-     */
-    public void testLockScreenStatusDriverDistNull(){
-        LockScreenManager lockMan = new LockScreenManager();
-      
-        OnLockScreenStatus result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_NONE);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_BACKGROUND);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_FULL);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.REQUIRED, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_LIMITED);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.REQUIRED, result.getShowLockScreen());
-    }
-
-    /**
-     * Test the enabled settings of lock screen status.
-     */
-    public void testLockScreenStatusDriverDistEnabled(){
-        LockScreenManager lockMan = new LockScreenManager();
-        lockMan.setDriverDistStatus(true);
-
-        // HMI level is null
-        OnLockScreenStatus result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_NONE);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_BACKGROUND);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_FULL);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.REQUIRED, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_LIMITED);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.REQUIRED, result.getShowLockScreen());
-    }
-
-    /**
-     * Test the disabled settings of lock screen status.
-     */
-    public void testLockScreenStatusDriverDistDisabled(){
-        LockScreenManager lockMan = new LockScreenManager();
-        lockMan.setDriverDistStatus(false);
-
-        OnLockScreenStatus result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_NONE);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_BACKGROUND);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OFF, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_FULL);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OPTIONAL, result.getShowLockScreen());
-
-        lockMan.setHMILevel(HMILevel.HMI_LIMITED);
-        result = lockMan.getLockObj();
-        assertEquals(TestValues.MATCH, LockScreenStatus.OPTIONAL, result.getShowLockScreen());
-    }
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
index e95fdf887..3d8925e29 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
@@ -61,7 +61,6 @@ public class VrCapabilitiesTests extends TestCase {
 
 		List<VrCapabilities> enumTestList = new ArrayList<VrCapabilities>();
 		enumTestList.add(VrCapabilities.TEXT);
-		enumTestList.add(VrCapabilities.Text);
 
 		assertTrue("Enum value list does not match enum class list", 
 				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
deleted file mode 100644
index d73b39beb..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCMessage;
-import com.smartdevicelink.proxy.rpc.OnHMIStatus;
-import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;
-import com.smartdevicelink.proxy.rpc.enums.HMILevel;
-import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
-import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.TestValues;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.fail;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.rpc.OnLockScreenStatus}
- */
-public class OnLockScreenStatusTests extends BaseRpcTests{
-
-    @Override
-    protected RPCMessage createMessage(){
-        OnLockScreenStatus msg = new OnLockScreenStatus();
-
-        msg.setDriverDistractionStatus(TestValues.GENERAL_BOOLEAN);
-        msg.setHMILevel(TestValues.GENERAL_HMILEVEL);
-        msg.setShowLockScreen(TestValues.GENERAL_LOCKSCREENSTATUS);
-        msg.setUserSelected(TestValues.GENERAL_BOOLEAN);
-
-        return msg;
-    }
-
-    @Override
-    protected String getMessageType(){
-        return RPCMessage.KEY_NOTIFICATION;
-    }
-
-    @Override
-    protected String getCommandType(){
-        return FunctionID.ON_LOCK_SCREEN_STATUS.toString();
-    }
-
-    @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
-        JSONObject result = new JSONObject();
-
-        try{
-            result.put(OnLockScreenStatus.KEY_DRIVER_DISTRACTION, TestValues.GENERAL_BOOLEAN);
-            result.put(OnHMIStatus.KEY_HMI_LEVEL, TestValues.GENERAL_HMILEVEL);
-            result.put(OnLockScreenStatus.KEY_SHOW_LOCK_SCREEN, TestValues.GENERAL_LOCKSCREENSTATUS);
-            result.put(OnLockScreenStatus.KEY_USER_SELECTED, TestValues.GENERAL_BOOLEAN);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
-        }
-
-        return result;
-    }
-
-    /**
-	 * Tests the expected values of the RPC message.
-	 */
-    @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        Boolean status = ( (OnLockScreenStatus) msg ).getDriverDistractionStatus();
-        HMILevel hmiLevel = ( (OnLockScreenStatus) msg ).getHMILevel();
-        LockScreenStatus lockScreen = ( (OnLockScreenStatus) msg ).getShowLockScreen();
-        boolean userSelected = ( (OnLockScreenStatus) msg ).getUserSelected();
-        
-        // Valid Tests
-        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, status);
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL, hmiLevel);
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_LOCKSCREENSTATUS, lockScreen);
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, userSelected);
-    
-        // Invalid/Null Tests
-        OnLockScreenStatus msg = new OnLockScreenStatus();
-        assertNotNull(TestValues.NOT_NULL, msg);
-        testNullBase(msg);
-
-        assertNull(TestValues.NULL, msg.getDriverDistractionStatus());
-        assertNull(TestValues.NULL, msg.getHMILevel());
-        assertNull(TestValues.NULL, msg.getShowLockScreen());
-        assertNull(TestValues.NULL, msg.getUserSelected());
-    }
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
deleted file mode 100644
index f3efebe84..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCMessage;
-import com.smartdevicelink.proxy.rpc.OnSdlChoiceChosen;
-import com.smartdevicelink.proxy.rpc.OnSdlChoiceChosen.SdlChoice;
-import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
-import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.TestValues;
-import com.smartdevicelink.test.Validator;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
-import static junit.framework.TestCase.fail;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.rpc.OnSdlChoiceChosen}
- */
-public class OnSdlChoiceChosenTests extends BaseRpcTests{
-
-    SdlChoice sdlChoice;
-
-    @Override
-    protected RPCMessage createMessage(){
-        OnSdlChoiceChosen msg = new OnSdlChoiceChosen();                
-        sdlChoice = msg.new SdlChoice(TestValues.GENERAL_CHOICE);
-        
-        msg.setTriggerSource(TestValues.GENERAL_TRIGGERSOURCE);
-		msg.setSdlChoice(sdlChoice);
-		
-        return msg;
-    }
-
-    @Override
-    protected String getMessageType(){
-        return RPCMessage.KEY_NOTIFICATION;
-    }
-
-    @Override
-    protected String getCommandType(){
-        return FunctionID.ON_SDL_CHOICE_CHOSEN.toString();
-    }
-
-    @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
-        JSONObject result = new JSONObject();
-
-        try{
-            result.put(OnSdlChoiceChosen.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE);
-            result.put(OnSdlChoiceChosen.KEY_SDL_CHOICE, sdlChoice);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
-        }
-
-        return result;
-    }
-
-    /**
-	 * Tests the expected values of the RPC message.
-	 */
-    @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        SdlChoice data = ( (OnSdlChoiceChosen) msg ).getSdlChoice();
-        TriggerSource source = ( (OnSdlChoiceChosen) msg ).getTriggerSource();
-        
-        // Valid Tests
-        assertTrue(TestValues.MATCH, Validator.validateChoice(TestValues.GENERAL_CHOICE, data.getChoice()));
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, source);
-    
-        // Invalid/Null Tests
-    	OnSdlChoiceChosen msg = new OnSdlChoiceChosen();
-        assertNotNull(TestValues.NOT_NULL, msg);
-        testNullBase(msg);
-
-        assertNull(TestValues.NULL, msg.getTriggerSource());
-        assertNull(TestValues.NULL, msg.getSdlChoice());
-    }
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java
deleted file mode 100644
index 863abf4e0..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnStreamRPCTests.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCMessage;
-import com.smartdevicelink.proxy.rpc.OnStreamRPC;
-import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.TestValues;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.fail;
-
-/**
- * Created by austinkirk on 6/7/17.
- */
-
-public class OnStreamRPCTests extends BaseRpcTests {
-    @Override
-    protected RPCMessage createMessage(){
-        OnStreamRPC msg = new OnStreamRPC();
-
-        msg.setBytesComplete(TestValues.GENERAL_LONG);
-        msg.setFileName(TestValues.GENERAL_STRING);
-        msg.setFileSize(TestValues.GENERAL_LONG);
-
-        return msg;
-    }
-
-    @Override
-    protected String getMessageType(){
-        return RPCMessage.KEY_NOTIFICATION;
-    }
-
-    @Override
-    protected String getCommandType(){
-        return FunctionID.ON_STREAM_RPC.toString();
-    }
-
-    @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
-        JSONObject result = new JSONObject();
-
-        try{
-            result.put(OnStreamRPC.KEY_BYTESCOMPLETE, TestValues.GENERAL_LONG);
-            result.put(OnStreamRPC.KEY_FILENAME, TestValues.GENERAL_STRING);
-            result.put(OnStreamRPC.KEY_FILESIZE, TestValues.GENERAL_LONG);
-        }catch(JSONException e){
-            fail(TestValues.JSON_FAIL);
-        }
-
-        return result;
-    }
-
-    /**
-     * Tests the expected values of the RPC message.
-     */
-    @Test
-    public void testRpcValues () {
-        // Test Values
-        Long bytes = ((OnStreamRPC) msg).getBytesComplete();
-        String fileName = ((OnStreamRPC) msg).getFileName();
-        Long fileSize = ((OnStreamRPC) msg).getFileSize();
-
-        // Valid Tests
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, bytes);
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName);
-        assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, fileSize);
-
-        // Invalid/Null Tests
-        OnStreamRPC msg = new OnStreamRPC();
-        assertNotNull(TestValues.NOT_NULL, msg);
-        testNullBase(msg);
-
-        assertNull(TestValues.NULL, msg.getBytesComplete());
-        assertNull(TestValues.NULL, msg.getFileName());
-        assertNull(TestValues.NULL, msg.getFileSize());
-    }
-}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java
deleted file mode 100644
index 2dcfb0509..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/StreamRPCResponseTests.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.smartdevicelink.test.rpc.responses;
-
-import com.smartdevicelink.marshal.JsonRPCMarshaller;
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCMessage;
-import com.smartdevicelink.proxy.rpc.StreamRPCResponse;
-import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.JsonUtils;
-import com.smartdevicelink.test.TestValues;
-import com.smartdevicelink.test.json.rpc.JsonFileReader;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-
-import java.util.Hashtable;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-
-
-/**
- * Created by austinkirk on 6/7/17.
- */
-
-public class StreamRPCResponseTests extends BaseRpcTests {
-    @Override
-    protected RPCMessage createMessage(){
-        StreamRPCResponse response = new StreamRPCResponse();
-        response.setFileSize((Long) TestValues.GENERAL_LONG);
-        response.setFileName(TestValues.GENERAL_STRING);
-        return response;
-    }
-
-    @Override
-    protected String getMessageType(){
-        return RPCMessage.KEY_RESPONSE;
-    }
-
-    @Override
-    protected String getCommandType(){
-        return FunctionID.STREAM_RPC.toString();
-    }
-
-    @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
-        JSONObject result = new JSONObject();
-
-        try {
-            result.put(StreamRPCResponse.KEY_FILESIZE, (Long) TestValues.GENERAL_LONG);
-            result.put(StreamRPCResponse.KEY_FILENAME, TestValues.GENERAL_STRING);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-
-        return result;
-    }
-
-    /**
-     * Tests the expected values of the RPC message.
-     */
-    @Test
-    public void testRpcValues () {
-        // Invalid/Null Tests
-        StreamRPCResponse msg = new StreamRPCResponse();
-        assertNotNull(TestValues.NOT_NULL, msg);
-        testNullBase(msg);
-    }
-
-    /**
-     * Tests a valid JSON construction of this RPC message.
-     */
-    @Test
-    public void testJsonConstructor () {
-        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-        assertNotNull(TestValues.NOT_NULL, commandJson);
-
-        try {
-            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-            StreamRPCResponse cmd = new StreamRPCResponse(hash);
-
-            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-            assertNotNull(TestValues.NOT_NULL, body);
-
-            // Test everything in the json body.
-            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, StreamRPCResponse.KEY_FILENAME), cmd.getFileName());
-            assertEquals(TestValues.MATCH, JsonUtils.readLongFromJsonObject(parameters, StreamRPCResponse.KEY_FILESIZE), cmd.getFileSize());
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java
index fd5e5c891..69180d255 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/ProxyBridge.java
@@ -80,10 +80,8 @@ import com.smartdevicelink.proxy.rpc.OnHashChange;
 import com.smartdevicelink.proxy.rpc.OnInteriorVehicleData;
 import com.smartdevicelink.proxy.rpc.OnKeyboardInput;
 import com.smartdevicelink.proxy.rpc.OnLanguageChange;
-import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;
 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;
 import com.smartdevicelink.proxy.rpc.OnRCStatus;
-import com.smartdevicelink.proxy.rpc.OnStreamRPC;
 import com.smartdevicelink.proxy.rpc.OnSystemCapabilityUpdated;
 import com.smartdevicelink.proxy.rpc.OnSystemRequest;
 import com.smartdevicelink.proxy.rpc.OnTBTClientState;
@@ -113,7 +111,6 @@ import com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse;
 import com.smartdevicelink.proxy.rpc.ShowResponse;
 import com.smartdevicelink.proxy.rpc.SliderResponse;
 import com.smartdevicelink.proxy.rpc.SpeakResponse;
-import com.smartdevicelink.proxy.rpc.StreamRPCResponse;
 import com.smartdevicelink.proxy.rpc.SubscribeButtonResponse;
 import com.smartdevicelink.proxy.rpc.SubscribeVehicleDataResponse;
 import com.smartdevicelink.proxy.rpc.SubscribeWayPointsResponse;
@@ -227,16 +224,16 @@ public class ProxyBridge implements IProxyListener{
 		lifecycleListener.onError(info, e);
 	}
 
-	@Override
-	public void onOnStreamRPC(OnStreamRPC notification) {
-		onRPCReceived(notification);
-
-	}
-
-	@Override
-	public void onStreamRPCResponse(StreamRPCResponse response) {
-		onRPCReceived(response);
-	}
+//	@Override
+//	public void onOnStreamRPC(OnStreamRPC notification) {
+//		onRPCReceived(notification);
+//
+//	}
+//
+//	@Override
+//	public void onStreamRPCResponse(StreamRPCResponse response) {
+//		onRPCReceived(response);
+//	}
 
 	@Override
 	public void onOnHMIStatus(OnHMIStatus notification) {
@@ -505,10 +502,10 @@ public class ProxyBridge implements IProxyListener{
 
 	}
 
-	@Override
-	public void onOnLockScreenNotification(OnLockScreenStatus notification) {
-		onRPCReceived(notification);
-	}
+//	@Override
+//	public void onOnLockScreenNotification(OnLockScreenStatus notification) {
+//		onRPCReceived(notification);
+//	}
 
 	@Override
 	public void onDialNumberResponse(DialNumberResponse response) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
index d94372740..6cb19000e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
@@ -33,7 +33,6 @@ package com.smartdevicelink.proxy;
 

 import android.graphics.Bitmap;

 

-import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;

 import com.smartdevicelink.proxy.rpc.enums.HMILevel;

 import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;

 import com.smartdevicelink.util.AndroidTools;

@@ -84,17 +83,17 @@ public class LockScreenManager {
 		}

 	}

 	

-	public synchronized OnLockScreenStatus getLockObj(/*int SessionID*/)

-	{

-		//int iSessionID = SessionID;

-		OnLockScreenStatus myLock = new OnLockScreenStatus();

-		myLock.setDriverDistractionStatus(bDriverDistStatus);

-		myLock.setHMILevel(hmiLevel);

-		myLock.setUserSelected(bUserSelected);

-		myLock.setShowLockScreen(getLockScreenStatus());

-		

-		return myLock;

-	}

+//	public synchronized OnLockScreenStatus getLockObj(/*int SessionID*/)

+//	{

+//		//int iSessionID = SessionID;

+//		OnLockScreenStatus myLock = new OnLockScreenStatus();

+//		myLock.setDriverDistractionStatus(bDriverDistStatus);

+//		myLock.setHMILevel(hmiLevel);

+//		myLock.setUserSelected(bUserSelected);

+//		myLock.setShowLockScreen(getLockScreenStatus());

+//

+//		return myLock;

+//	}

 	

 	private synchronized LockScreenStatus getLockScreenStatus() 

 	{

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
index d046fe5ad..1d1216b40 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
@@ -868,7 +868,7 @@ public class RPCRequestFactory {
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setPrndl(prndl);

@@ -894,7 +894,7 @@ public class RPCRequestFactory {
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setPrndl(prndl);

@@ -920,7 +920,7 @@ public class RPCRequestFactory {
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setVin(vin);

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index daf203b5f..332cb696f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -98,7 +98,6 @@ import com.smartdevicelink.proxy.rpc.enums.PrerecordedSpeech;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;

 import com.smartdevicelink.proxy.rpc.enums.Result;

 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;

-import com.smartdevicelink.proxy.rpc.enums.SdlConnectionState;

 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;

 import com.smartdevicelink.proxy.rpc.enums.SdlInterfaceAvailability;

 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;

@@ -270,7 +269,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 	protected Boolean _haveReceivedFirstFocusLevel = false;

 	protected Boolean _haveReceivedFirstFocusLevelFull = false;

 	protected Boolean _proxyDisposed = false;

-	protected SdlConnectionState _sdlConnectionState = null;

+	//protected SdlConnectionState _sdlConnectionState = null;

 	protected SdlInterfaceAvailability _sdlIntefaceAvailablity = null;

 	protected HMILevel _hmiLevel = null;

 	protected OnHMIStatus lastHmiStatus;

@@ -1601,7 +1600,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 

 			// ALM Specific Cleanup

 			if (_advancedLifecycleManagementEnabled) {

-				_sdlConnectionState = SdlConnectionState.SDL_DISCONNECTED;

+				//_sdlConnectionState = SdlConnectionState.SDL_DISCONNECTED;

 				

 				firstTimeFull = true;

 			

@@ -2575,7 +2574,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 					sendBroadcastIntent(sendIntent);

 					

 					// Send onSdlConnected message in ALM

-					_sdlConnectionState = SdlConnectionState.SDL_CONNECTED;

+					//_sdlConnectionState = SdlConnectionState.SDL_CONNECTED;

 					

 					// If registerAppInterface failed, exit with OnProxyUnusable

 					if (!msg.getSuccess()) {

@@ -2736,7 +2735,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 				if (_advancedLifecycleManagementEnabled) {

 					

 					// Send onSdlConnected message in ALM

-					_sdlConnectionState = SdlConnectionState.SDL_CONNECTED;

+					//_sdlConnectionState = SdlConnectionState.SDL_CONNECTED;

 					

 					// If registerAppInterface failed, exit with OnProxyUnusable

 					if (!msg.getSuccess()) {

@@ -7128,7 +7127,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setPrndl(prndl);

@@ -7177,7 +7176,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setPrndl(prndl);

@@ -7228,7 +7227,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setPrndl(prndl);

@@ -7278,7 +7277,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setPrndl(prndl);

@@ -7329,7 +7328,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setVin(vin);

@@ -7380,7 +7379,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSpeed(speed);

 		msg.setRpm(rpm);

 		msg.setFuelLevel(fuelLevel);

-		msg.setFuelLevel_State(fuelLevel_State);

+		msg.setFuelLevelState(fuelLevel_State);

 		msg.setInstantFuelConsumption(instantFuelConsumption);

 		msg.setExternalTemperature(externalTemperature);

 		msg.setVin(vin);

@@ -7610,7 +7609,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSystemFile(true);

 		msg.setOffset(offset);

 		msg.setLength(length);

-		msg.setOnPutFileUpdateListener(cb);

+		//msg.setOnPutFileUpdateListener(cb);

 		startRPCStream(inputStream, msg);

 	}

 	

@@ -7667,7 +7666,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setSystemFile(true);

 		msg.setOffset(offset);

 		msg.setLength(length);

-		msg.setOnPutFileUpdateListener(cb);

+		//msg.setOnPutFileUpdateListener(cb);

 

 		return startRPCStream(msg);

 	}

@@ -7733,7 +7732,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setOffset(offset);

 		msg.setLength(0L);

 		msg.setPayloadProtected(isPayloadProtected);

-		msg.setOnPutFileUpdateListener(cb);

+		//msg.setOnPutFileUpdateListener(cb);

 

 		return startPutFileStream(path,msg);

 	}

@@ -7762,8 +7761,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		msg.setCorrelationID(iCorrelationID);

 		msg.setPersistentFile(bPersistentFile);

 		msg.setSystemFile(bSystemFile);

-		msg.setOffset(iOffset);

-		msg.setLength(iLength);

+		msg.setOffset(Long.valueOf(iOffset));

+		msg.setLength(Long.valueOf(iLength));

 

 		return startPutFileStream(is, msg);

 	}

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
index 59904888d..5d32aa391 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
@@ -42,23 +42,20 @@ import com.smartdevicelink.proxy.RPCResponse;
 import com.smartdevicelink.proxy.SdlProxyBase;

 import com.smartdevicelink.proxy.interfaces.IProxyListenerBase;

 import com.smartdevicelink.proxy.interfaces.IPutFileResponseListener;

-import com.smartdevicelink.proxy.rpc.OnStreamRPC;

 import com.smartdevicelink.proxy.rpc.PutFile;

 import com.smartdevicelink.proxy.rpc.PutFileResponse;

-import com.smartdevicelink.proxy.rpc.StreamRPCResponse;

 import com.smartdevicelink.proxy.rpc.enums.Result;

 import com.smartdevicelink.proxy.rpc.listeners.OnPutFileUpdateListener;

 import com.smartdevicelink.util.Version;

 

 import java.io.IOException;

 import java.io.InputStream;

-import java.util.Hashtable;

 

 @Deprecated

 public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileResponseListener, Runnable{

 

 	private Integer iInitialCorrID = 0;

-	private Hashtable<Integer, OnStreamRPC> notificationList = new Hashtable<Integer, OnStreamRPC>();

+	//private Hashtable<Integer, OnStreamRPC> notificationList = new Hashtable<Integer, OnStreamRPC>();

 	private Thread thread = null;

 	private long lFileSize = 0;

 	private String sFileName;

@@ -86,7 +83,7 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 			_proxy.addPutFileResponseListener(this);

 		}

 		if(_request.getFunctionName().equalsIgnoreCase(FunctionID.PUT_FILE.toString())){

-			callBack = ((PutFile)_request).getOnPutFileUpdateListener();

+			//callBack = ((PutFile)_request).getOnPutFileUpdateListener();

 		}

 	}

 

@@ -104,7 +101,7 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 			_proxy.addPutFileResponseListener(this);

 		}

 		if(_request.getFunctionName().equalsIgnoreCase(FunctionID.PUT_FILE.toString())){

-			callBack = ((PutFile)_request).getOnPutFileUpdateListener();

+			//callBack = ((PutFile)_request).getOnPutFileUpdateListener();

 		}

 	}

 

@@ -130,50 +127,50 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 

 	private void handleStreamSuccess(RPCResponse rpc, Long iSize)

 	{

-		StreamRPCResponse result = new StreamRPCResponse();

-		result.setSuccess(rpc.getSuccess());

-		result.setResultCode(rpc.getResultCode());

-		result.setInfo(rpc.getInfo());

-		result.setFileName(sFileName);

-		result.setFileSize(iSize);

-		result.setCorrelationID(iInitialCorrID);

-		if (_proxyListener != null)

-			_proxyListener.onStreamRPCResponse(result);

-		stop();

-		_proxy.remPutFileResponseListener(this);

-		return;	

+//		StreamRPCResponse result = new StreamRPCResponse();

+//		result.setSuccess(rpc.getSuccess());

+//		result.setResultCode(rpc.getResultCode());

+//		result.setInfo(rpc.getInfo());

+//		result.setFileName(sFileName);

+//		result.setFileSize(iSize);

+//		result.setCorrelationID(iInitialCorrID);

+//		if (_proxyListener != null)

+//			_proxyListener.onStreamRPCResponse(result);

+//		stop();

+//		_proxy.remPutFileResponseListener(this);

+//		return;

 	}

 	

 	private void handleStreamException(RPCResponse rpc, Exception e, String error)

 	{

-		StreamRPCResponse result = new StreamRPCResponse();

-		result.setFileName(sFileName);

-		result.setCorrelationID(iInitialCorrID);

-		if (rpc != null)

-		{

-			result.setSuccess(rpc.getSuccess());

-			result.setResultCode(rpc.getResultCode());

-			result.setInfo(rpc.getInfo());

-		}

-		else

-		{

-			result.setSuccess(false);

-			result.setResultCode(Result.GENERIC_ERROR);

-			String sException = "";

-			

-			if (e != null)

-				sException = sException + " " + e.toString();

-			

-			sException = sException + " " + error;

-			result.setInfo(sException);

-		}

-		if (_proxyListener != null)

-			_proxyListener.onStreamRPCResponse(result);		

-		if (e != null)

-			e.printStackTrace();

-		stop();

-		_proxy.remPutFileResponseListener(this);

-		return;

+//		StreamRPCResponse result = new StreamRPCResponse();

+//		result.setFileName(sFileName);

+//		result.setCorrelationID(iInitialCorrID);

+//		if (rpc != null)

+//		{

+//			result.setSuccess(rpc.getSuccess());

+//			result.setResultCode(rpc.getResultCode());

+//			result.setInfo(rpc.getInfo());

+//		}

+//		else

+//		{

+//			result.setSuccess(false);

+//			result.setResultCode(Result.GENERIC_ERROR);

+//			String sException = "";

+//

+//			if (e != null)

+//				sException = sException + " " + e.toString();

+//

+//			sException = sException + " " + error;

+//			result.setInfo(sException);

+//		}

+//		if (_proxyListener != null)

+//			_proxyListener.onStreamRPCResponse(result);

+//		if (e != null)

+//			e.printStackTrace();

+//		stop();

+//		_proxy.remPutFileResponseListener(this);

+//		return;

 	}

 

     @Override

@@ -195,7 +192,7 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 		int length;

 		byte[] msgBytes;

 		ProtocolMessage pm;

-		OnStreamRPC notification;

+		//OnStreamRPC notification;

 		

 		// Moves the current Thread into the background

 		android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);

@@ -217,7 +214,7 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 			}

 			Long iFileLength = msg.getLength();

 			

-			notificationList.clear();			

+			//notificationList.clear();

 			

 			//start reading from the stream at the given offset

 			long iSkipBytes = is.skip(iOffsetCounter);

@@ -273,12 +270,12 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 					priorityCoefficient++;

 					pm.setPriorityCoefficient(priorityCoefficient);

 						

-					notification = new OnStreamRPC();

-					notification.setFileName(msg.getSdlFileName());

-					notification.setFileSize(iFileLength);										

-			        iOffsetCounter = iOffsetCounter + length;

-			        notification.setBytesComplete(iOffsetCounter);

-			        notificationList.put(msg.getCorrelationID(),notification);

+//					notification = new OnStreamRPC();

+//					notification.setFileName(msg.getSdlFileName());

+//					notification.setFileSize(iFileLength);

+//			        iOffsetCounter = iOffsetCounter + length;

+//			        notification.setBytesComplete(iOffsetCounter);

+//			        notificationList.put(msg.getCorrelationID(),notification);

 			        

 			        msg.setOffset(iOffsetCounter);

 					iCorrID = msg.getCorrelationID() + 1;

@@ -296,36 +293,36 @@ public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileR
 	public void onPutFileResponse(PutFileResponse response) 

 	{	

 		

-		OnStreamRPC streamNote = notificationList.get(response.getCorrelationID());

-		if (streamNote == null) return;

-		

-		if (response.getSuccess())

-		{

-			if(callBack!=null){

-				callBack.onUpdate(response.getCorrelationID(), streamNote.getBytesComplete(), lFileSize);

-			}

-			if (_proxyListener != null){

-				_proxyListener.onOnStreamRPC(streamNote);

-			}

-			

-		}		

-		else

-		{

-			if(callBack!=null){

-				callBack.onError(response.getCorrelationID(), response.getResultCode(), response.getInfo());

-			}

-			handleStreamException(response, null, "");

-			

-		}		

-		

-		if (response.getSuccess() && streamNote.getBytesComplete().equals(streamNote.getFileSize()) )

-		{

-			if(callBack!=null){

-				callBack.onResponse(iInitialCorrID, response, streamNote.getBytesComplete());

-			}

-			handleStreamSuccess(response, streamNote.getBytesComplete());

-			

-		}

+//		OnStreamRPC streamNote = notificationList.get(response.getCorrelationID());

+//		if (streamNote == null) return;

+//

+//		if (response.getSuccess())

+//		{

+//			if(callBack!=null){

+//				callBack.onUpdate(response.getCorrelationID(), streamNote.getBytesComplete(), lFileSize);

+//			}

+//			if (_proxyListener != null){

+//				_proxyListener.onOnStreamRPC(streamNote);

+//			}

+//

+//		}

+//		else

+//		{

+//			if(callBack!=null){

+//				callBack.onError(response.getCorrelationID(), response.getResultCode(), response.getInfo());

+//			}

+//			handleStreamException(response, null, "");

+//

+//		}

+//

+//		if (response.getSuccess() && streamNote.getBytesComplete().equals(streamNote.getFileSize()) )

+//		{

+//			if(callBack!=null){

+//				callBack.onResponse(iInitialCorrID, response, streamNote.getBytesComplete());

+//			}

+//			handleStreamSuccess(response, streamNote.getBytesComplete());

+//

+//		}

 	}

 

 	@Override

diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index 75469a69d..75afd665d 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -1204,7 +1204,7 @@ abstract class BaseLifecycleManager {
                     } else if (notification instanceof OnButtonPress) {
                         OnButtonPress onButtonPress = new OnButtonPress();
                         onButtonPress.setButtonPressMode(((OnButtonPress) notification).getButtonPressMode());
-                        onButtonPress.setCustomButtonName(((OnButtonPress) notification).getCustomButtonName());
+                        onButtonPress.setCustomButtonID(((OnButtonPress) notification).getCustomButtonID());
                         notification2 = onButtonPress;
                     } else {
                         return null;
diff --git a/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java b/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
index 8848e16d9..b9471209c 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
@@ -135,17 +135,6 @@ public enum FunctionID{
     ON_SUBTLE_ALERT_PRESSED(32788, "OnSubtleAlertPressed"),

     ON_UPDATE_FILE(32789, "OnUpdateFile"),

     ON_UPDATE_SUB_MENU(32790, "OnUpdateSubMenu"),

-

-    // MOCKED FUNCTIONS (NOT SENT FROM HEAD-UNIT)

-    @Deprecated

-    ON_LOCK_SCREEN_STATUS(-1, "OnLockScreenStatus"),

-    @Deprecated

-    ON_SDL_CHOICE_CHOSEN(-1, "OnSdlChoiceChosen"),

-    @Deprecated

-    ON_STREAM_RPC(-1, "OnStreamRPC"),

-    @Deprecated

-    STREAM_RPC(-1, "StreamRPC"),

-

     ;

 

     public static final int                 INVALID_ID = -1;

diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
index 988325bd9..e00309fb5 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IProxyListenerBase.java
@@ -73,10 +73,8 @@ import com.smartdevicelink.proxy.rpc.OnHashChange;
 import com.smartdevicelink.proxy.rpc.OnInteriorVehicleData;

 import com.smartdevicelink.proxy.rpc.OnKeyboardInput;

 import com.smartdevicelink.proxy.rpc.OnLanguageChange;

-import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;

 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;

 import com.smartdevicelink.proxy.rpc.OnRCStatus;

-import com.smartdevicelink.proxy.rpc.OnStreamRPC;

 import com.smartdevicelink.proxy.rpc.OnSystemCapabilityUpdated;

 import com.smartdevicelink.proxy.rpc.OnSystemRequest;

 import com.smartdevicelink.proxy.rpc.OnTBTClientState;

@@ -105,7 +103,6 @@ import com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse;
 import com.smartdevicelink.proxy.rpc.ShowResponse;

 import com.smartdevicelink.proxy.rpc.SliderResponse;

 import com.smartdevicelink.proxy.rpc.SpeakResponse;

-import com.smartdevicelink.proxy.rpc.StreamRPCResponse;

 import com.smartdevicelink.proxy.rpc.SubscribeButtonResponse;

 import com.smartdevicelink.proxy.rpc.SubscribeVehicleDataResponse;

 import com.smartdevicelink.proxy.rpc.SubscribeWayPointsResponse;

@@ -146,9 +143,9 @@ public interface IProxyListenerBase {
 

 	public void onServiceNACKed(OnServiceNACKed serviceNACKed);

 

-	public void onOnStreamRPC(OnStreamRPC notification);

+	//public void onOnStreamRPC(OnStreamRPC notification);

 

-	public void onStreamRPCResponse(StreamRPCResponse response);

+	//public void onStreamRPCResponse(StreamRPCResponse response);

 

 	/**

 	 * onProxyError() being called indicates that the SDL Proxy experenced an error.

@@ -370,7 +367,7 @@ public interface IProxyListenerBase {
 

 	public void onGetDTCsResponse(GetDTCsResponse response);

 

-	public void onOnLockScreenNotification(OnLockScreenStatus notification);

+	//public void onOnLockScreenNotification(OnLockScreenStatus notification);

 

 	public void onDialNumberResponse(DialNumberResponse response);

 

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
index da346d0f9..ff01b72e4 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

@@ -160,7 +160,6 @@ public class BeltStatus extends RPCStruct {
     public static final String KEY_LEFT_ROW_3_BUCKLE_BELTED = "leftRow3BuckleBelted";

 

     public static final String KEY_RIGHT_ROW_3_BUCKLE_BELTED = "rightRow3BuckleBelted";

-    @Deprecated public static final String KEY_REAR_INFLATABLE_BELTED = "rearInflatableBelted";

     public static final String KEY_LEFT_REAR_INFLATABLE_BELTED = "leftRearInflatableBelted";

     public static final String KEY_RIGHT_REAR_INFLATABLE_BELTED = "rightRearInflatableBelted";

     public static final String KEY_MIDDLE_ROW_1_BELT_DEPLOYED = "middleRow1BeltDeployed";

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
index 931752c73..72fb49a91 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Choice.java
@@ -127,22 +127,6 @@ public class Choice extends RPCStruct {
         setChoiceID(choiceID);

         setMenuName(menuName);

     }

-    

-    /**

-     * Constructs a newly allocated Choice object

-     * @param choiceID Min: 0  Max: 65535

-     * @param menuName the menu name

-     * @param vrCommands the List of  vrCommands

-     *

-     * Deprecated - use {@link #Choice(Integer, String)}

-     */

-    @Deprecated

-    public Choice(@NonNull Integer choiceID, @NonNull String menuName, @NonNull List<String> vrCommands) {

-        this();

-        setChoiceID(choiceID);

-        setMenuName(menuName);

-        setVrCommands(vrCommands);

-    }

 

     /**

      * VrCommands became optional as of RPC Spec 5.0. On legacy systems, we must still set VrCommands, as

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
index d8876a692..e1076935b 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeleteFileResponse.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

@@ -61,22 +61,6 @@ public class DeleteFileResponse extends RPCResponse {
     }

 

     /**

-     * @deprecated use {@link DeleteFileResponse#DeleteFileResponse(Boolean, Result)} instead <br>

-     *

-     * Constructs a new DeleteFileResponse object

-     * @param success whether the request is successfully processed

-     * @param resultCode whether the request is successfully processed

-     * @param spaceAvailable  the total local space available on the module for the registered app.

-     */

-    @Deprecated

-    public DeleteFileResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull Integer spaceAvailable) {

-        this();

-        setSuccess(success);

-        setResultCode(resultCode);

-        setSpaceAvailable(spaceAvailable);

-    }

-

-    /**

      * Constructs a new DeleteFileResponse object

      * @param success whether the request is successfully processed

      * @param resultCode whether the request is successfully processed

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
index 8113f2add..c19068eb0 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import com.smartdevicelink.proxy.RPCStruct;

@@ -108,8 +108,6 @@ public class DeviceInfo extends RPCStruct{
     public static final String KEY_OS_VERSION = "osVersion";

     public static final String KEY_CARRIER = "carrier";

     public static final String KEY_MAX_NUMBER_RFCOMM_PORTS = "maxNumberRFCOMMPorts";

-    @Deprecated

-    public static final String DEVICE_OS = "Android";

 

     public DeviceInfo() { }

 

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
index ce6492a64..c1a1cf5cb 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DiagnosticMessageResponse.java
@@ -57,19 +57,6 @@ public class DiagnosticMessageResponse extends RPCResponse {
     public DiagnosticMessageResponse(Hashtable<String, Object> hash) {

         super(hash);

     }

-    /**

-     * Constructs a new DiagnosticMessageResponse object

-     * @param success whether the request is successfully processed

-     * @param resultCode whether the request is successfully processed

-     * @deprecated use {@link DiagnosticMessageResponse#DiagnosticMessageResponse(Boolean, Result)}

-     */

-    @Deprecated

-    public DiagnosticMessageResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull List<Integer> messageDataResult) {

-        this();

-        setSuccess(success);

-        setResultCode(resultCode);

-        setMessageDataResult(messageDataResult);

-    }

 

     /**

      * Constructs a new DiagnosticMessageResponse object

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
index d1334f1ed..43b4b408e 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
@@ -94,7 +94,7 @@ import java.util.List;
  * 

  */

 public class DisplayCapabilities extends RPCStruct {

-	public static final String KEY_DISPLAY_TYPE = "displayType";

+	@Deprecated public static final String KEY_DISPLAY_TYPE = "displayType";

 	public static final String KEY_DISPLAY_NAME = "displayName";

 	public static final String KEY_MEDIA_CLOCK_FORMATS = "mediaClockFormats";

 	public static final String KEY_TEXT_FIELDS = "textFields";

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
index baeecc2f4..f36cd6127 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GPSData.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

@@ -195,7 +195,7 @@ public class GPSData extends RPCStruct {
 	public static final String KEY_ALTITUDE = "altitude";

 	public static final String KEY_HEADING = "heading";

 	public static final String KEY_SPEED = "speed";

-	public static final String KEY_SHIFTED = "shifted";
+	public static final String KEY_SHIFTED = "shifted";

 

 	/**

 	 * Constructs a newly allocated GPSData object

@@ -212,37 +212,6 @@ public class GPSData extends RPCStruct {
 

     /**

      * Constructs a newly allocated GPSData object

-     * @deprecated Use {@link #GPSData(@NonNull Double, @NonNull Double)()} instead

-     */

-    @Deprecated

-    public GPSData(@NonNull Double longitudeDegrees, @NonNull Double latitudeDegrees, @NonNull Integer utcYear,

-                   @NonNull Integer utcMonth, @NonNull Integer utcDay, @NonNull Integer utcHours,

-                   @NonNull Integer utcMinutes, @NonNull Integer utcSeconds, @NonNull CompassDirection compassDirection,

-                   @NonNull Double pdop, @NonNull Double hdop, @NonNull Double vdop, @NonNull Boolean actual,

-                   @NonNull Integer satellites, @NonNull Dimension dimension, @NonNull Double altitude, @NonNull Double heading, @NonNull Double speed) {

-        this();

-        setLongitudeDegrees(longitudeDegrees);

-        setLatitudeDegrees(latitudeDegrees);

-        setUtcYear(utcYear);

-        setUtcMonth(utcMonth);

-        setUtcDay(utcDay);

-        setUtcHours(utcHours);

-        setUtcMinutes(utcMinutes);

-        setUtcSeconds(utcSeconds);

-        setCompassDirection(compassDirection);

-        setPdop(pdop);

-        setHdop(hdop);

-        setVdop(vdop);

-        setActual(actual);

-        setSatellites(satellites);

-        setDimension(dimension);

-        setAltitude(altitude);

-        setHeading(heading);

-        setSpeed(speed);

-    }

-

-    /**

-     * Constructs a newly allocated GPSData object

      */

     public GPSData(@NonNull Double longitudeDegrees, @NonNull Double latitudeDegrees) {

         this();

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
index 023abc3c5..e7c54c02b 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetDTCsResponse.java
@@ -62,21 +62,6 @@ public class GetDTCsResponse extends RPCResponse{
      * Constructs a new GetDTCsResponse object

      * @param success whether the request is successfully processed

      * @param resultCode whether the request is successfully processed

-     * @param ecuHeader representation of the ecu header that was returned from the GetDTC request

-     * @deprecated use {@link GetDTCsResponse#GetDTCsResponse(Boolean, Result)}

-     */

-    @Deprecated

-    public GetDTCsResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull Integer ecuHeader) {

-        this();

-        setSuccess(success);

-        setResultCode(resultCode);

-        setEcuHeader(ecuHeader);

-    }

-

-    /**

-     * Constructs a new GetDTCsResponse object

-     * @param success whether the request is successfully processed

-     * @param resultCode whether the request is successfully processed

      */

     public GetDTCsResponse(@NonNull Boolean success, @NonNull Result resultCode) {

         this();

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
index c504c5d24..ccf1e7913 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetInteriorVehicleDataResponse.java
@@ -64,21 +64,6 @@ public class GetInteriorVehicleDataResponse extends RPCResponse {
 
 	/**
 	 * Constructs a new GetInteriorVehicleDataResponse object
-	 * @param moduleData specific data for the module that was requested
-	 * @param resultCode whether the request is successfully processed
-	 * @param success whether the request is successfully processed
-	 * @deprecated use {@link GetInteriorVehicleDataResponse#GetInteriorVehicleDataResponse(Result, Boolean)}
-	 */
-	@Deprecated
-	public GetInteriorVehicleDataResponse(@NonNull ModuleData moduleData, @NonNull Result resultCode, @NonNull Boolean success) {
-		this();
-		setModuleData(moduleData);
-		setResultCode(resultCode);
-		setSuccess(success);
-	}
-
-	/**
-	 * Constructs a new GetInteriorVehicleDataResponse object
 	 * @param resultCode whether the request is successfully processed
 	 * @param success whether the request is successfully processed
 	 */
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
index ebaf547b8..29803499e 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetSystemCapabilityResponse.java
@@ -66,21 +66,6 @@ public class GetSystemCapabilityResponse extends RPCResponse {
 
     /**
      * Constructs a new GetSystemCapabilityResponse object
-     * @param systemCapability SystemCapability object
-     * @param resultCode whether the request is successfully processed
-     * @param success whether the request is successfully processed
-     * @deprecated use {@link GetSystemCapabilityResponse#GetSystemCapabilityResponse(Result, Boolean)}
-     */
-    @Deprecated
-    public GetSystemCapabilityResponse(@NonNull SystemCapability systemCapability, @NonNull Result resultCode, @NonNull Boolean success) {
-        this();
-        setSystemCapability(systemCapability);
-        setResultCode(resultCode);
-        setSuccess(success);
-    }
-
-    /**
-     * Constructs a new GetSystemCapabilityResponse object
      * @param resultCode whether the request is successfully processed
      * @param success whether the request is successfully processed
      */
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
index ea3fc3496..eaba72662 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java
@@ -348,14 +348,6 @@ public class GetVehicleData extends RPCRequest {
     public Boolean getFuelLevel() {

         return getBoolean(KEY_FUEL_LEVEL);

     }

-    @Deprecated

-    public void setFuelLevel_State(Boolean fuelLevel_State) {

-        setFuelLevelState(fuelLevel_State);

-    }

-    @Deprecated

-    public Boolean getFuelLevel_State() {

-        return getFuelLevelState();

-    }

     public void setFuelLevelState(Boolean fuelLevelState) {

         setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);

     }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
index a70082cd6..25bff8861 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java
@@ -134,14 +134,6 @@ public class GetVehicleDataResponse extends RPCResponse {
     	Object object = getParameters(KEY_FUEL_LEVEL);

     	return SdlDataTypeConverter.objectToDouble(object);

     }

-    @Deprecated

-    public void setFuelLevel_State(ComponentVolumeStatus fuelLevel_State) {

-        setFuelLevelState(fuelLevel_State);

-    }

-    @Deprecated

-    public ComponentVolumeStatus getFuelLevel_State() {

-        return getFuelLevelState();

-    }

     public void setFuelLevelState(ComponentVolumeStatus fuelLevelState) {

         setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);

     }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
index cad593aba..e69e0a900 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/ListFilesResponse.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

@@ -62,21 +62,6 @@ public class ListFilesResponse extends RPCResponse {
     }

 

     /**

-     * @deprecated use {@link ListFilesResponse#ListFilesResponse(Boolean, Result)} instead <br>

-     *

-     * Constructs a new ListFilesResponse object

-     * @param success whether the request is successfully processed

-     * @param resultCode whether the request is successfully processed

-     */

-    @Deprecated

-    public ListFilesResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull Integer spaceAvailable) {

-        this();

-        setSuccess(success);

-        setResultCode(resultCode);

-        setSpaceAvailable(spaceAvailable);

-    }

-

-    /**

      * Constructs a new ListFilesResponse object

      * @param success whether the request is successfully processed

      * @param resultCode whether the request is successfully processed

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
index f66ca4000..8c0003db8 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

@@ -180,22 +180,6 @@ public class OnButtonPress extends RPCNotification {
         setParameters(KEY_BUTTON_PRESS_MODE, buttonPressMode);

     }

 

-    @Deprecated

-    /**

-    * @deprecated use {@link #setCustomButtonID(Integer)} ()} instead.

-    */

-    public void setCustomButtonName(Integer customButtonID) {

-        setParameters(KEY_CUSTOM_BUTTON_ID, customButtonID);

-    }

-
-    @Deprecated

-    /**

-     * @deprecated use {@link #getCustomButtonID()} ()} instead.

-    */

-    public Integer getCustomButtonName() {

-    	return getInteger(KEY_CUSTOM_BUTTON_ID);

-    }

-

     /**

      * Set CustomButtonID of the button

      * If ButtonName is "CUSTOM_BUTTON", this references the integer ID passed by a custom button. (e.g. softButton ID)

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
deleted file mode 100644
index dd8c75a01..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLockScreenStatus.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.rpc;

-

-import com.smartdevicelink.protocol.enums.FunctionID;

-import com.smartdevicelink.proxy.RPCNotification;

-import com.smartdevicelink.proxy.rpc.enums.HMILevel;

-import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;

-

-import static com.smartdevicelink.proxy.rpc.OnHMIStatus.KEY_HMI_LEVEL;

-

-/**

- * The lockscreen must perform the following:

- *	Limit all application control usability from the mobile device with a full-screen static image overlay or separate view.

- *	For simplicity, the OnLockScreenStatus RPC will be provided via the onOnLockScreenNotification call back. The call back will include the LockScreenStatus enum which indicates if the lockscreen is required, optional or not required.

- *	The call back also includes details regarding the current HMI_Status level, driver distraction status and user selection status of the application. 

- * 

- *

- */

-@Deprecated

-public class OnLockScreenStatus extends RPCNotification {

-	public static final String KEY_DRIVER_DISTRACTION = "driverDistraction";

-	public static final String KEY_SHOW_LOCK_SCREEN = "showLockScreen";

-	public static final String KEY_USER_SELECTED = "userSelected";

-

-	public OnLockScreenStatus() {

-		super(FunctionID.ON_LOCK_SCREEN_STATUS.toString());

-	}

-    /**

-     * <p>Get the current driver distraction status(i.e. whether driver distraction rules are in effect, or not)</p>

-     * @return Boolean

-     */    

-

-	public Boolean getDriverDistractionStatus() {

-		return getBoolean(KEY_DRIVER_DISTRACTION);

-	}

-	

-	public void setDriverDistractionStatus(Boolean driverDistractionStatus) {

-		setParameters(KEY_DRIVER_DISTRACTION, driverDistractionStatus);

-	}	

-    /**

-     * <p>Get the {@linkplain LockScreenStatus} enumeration, indicating if the lockscreen should be required, optional or off </p>

-     * @return {@linkplain LockScreenStatus} 

-     */    	

-

-	public LockScreenStatus getShowLockScreen() {

-		return (LockScreenStatus) getParameters(KEY_SHOW_LOCK_SCREEN);

-	}

-	

-	public void setShowLockScreen(LockScreenStatus showLockScreen) {

-		setParameters(KEY_SHOW_LOCK_SCREEN, showLockScreen);

-	}

-    /**

-     * <p>Get user selection status for the application (has the app been selected via hmi or voice command)</p>

-     * @return Boolean the current user selection status

-     */    

-

-	public Boolean getUserSelected() {

-		return getBoolean(KEY_USER_SELECTED);

-	}

-	

-	public void setUserSelected(Boolean userSelected) {

-		setParameters(KEY_USER_SELECTED, userSelected);

-	}		

-    /**

-     * <p>Get HMILevel in effect for the application</p>

-     * @return {@linkplain HMILevel} the current HMI Level in effect for the application

-     */    

-

-	public HMILevel getHMILevel() {

-		return (HMILevel) getParameters(KEY_HMI_LEVEL);

-	}

-	

-	public void setHMILevel(HMILevel setHMILevel) {

-		setParameters(KEY_HMI_LEVEL, setHMILevel);

-	}				

-}

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
deleted file mode 100644
index 8ad750815..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSdlChoiceChosen.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*

- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * Redistributions of source code must retain the above copyright notice, this

- * list of conditions and the following disclaimer.

- *

- * Redistributions in binary form must reproduce the above copyright notice,

- * this list of conditions and the following

- * disclaimer in the documentation and/or other materials provided with the

- * distribution.

- *

- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

- * software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-package com.smartdevicelink.proxy.rpc;

-

-import com.smartdevicelink.protocol.enums.FunctionID;

-import com.smartdevicelink.proxy.RPCNotification;

-import com.smartdevicelink.proxy.rpc.enums.TriggerSource;

-

-import java.util.Hashtable;

-import java.util.List;

-

-@Deprecated

-public class OnSdlChoiceChosen extends RPCNotification {

-	public static final String KEY_SDL_CHOICE = "sdlChoice";

-	public static final String KEY_TRIGGER_SOURCE = "triggerSource";

-	

-	public class SdlSubMenu {

-		private Integer _menuID = null;

-		@SuppressWarnings("unused")

-        private Integer _position = null;

-		private String _menuName = null;

-		

-		// Constructor

-		SdlSubMenu(Integer menuID, Integer position, String menuName) {

-			_menuID = menuID;

-			_position = position;

-			_menuName = menuName;

-		}

-		

-		// Restrict no-arg constructor

-		@SuppressWarnings("unused")

-        private SdlSubMenu() {}

-		

-		// Public Getters

-		public Integer getMenuID() {

-			return _menuID;

-		}

-		

-		public String getMenuName() {

-			return _menuName;

-		}

-		

-		public String toString() {

-			return _menuName;

-		}

-	}

-	

-	public class SdlCommand {

-		private Integer _commandID = null;

-		private SdlSubMenu _parentSubMenu = null;

-		@SuppressWarnings("unused")

-        private Integer _position = null;

-		private String _menuName = null;

-		private List<String> _vrCommands = null;

-		

-		// Constructor

-		SdlCommand(Integer commandID, SdlSubMenu parentSubMenu, Integer position, String menuName, List<String> vrCommands) {

-			_commandID = commandID;

-			_parentSubMenu = parentSubMenu;

-			_position = position;

-			_menuName = menuName;

-			_vrCommands = vrCommands;

-		}

-		

-		// Restrict no-arg constructor

-		@SuppressWarnings("unused")

-        private SdlCommand() {}

-		

-		// Public Getters

-		public Integer getCommandID() {

-			return _commandID;

-		}

-		

-		public SdlSubMenu getParentSubMenu() {

-			return _parentSubMenu;

-		}

-		

-		public String getMenuName() {

-			return _menuName;

-		}

-		

-		public List<String> getVrCommands() {

-			return _vrCommands;

-		}

-		

-		public String toString() {

-			return _menuName;

-		}

-	}

-	

-	public class SdlChoice {

-		

-		private Choice _choice = null;

-		

-		// Constructor

-		public SdlChoice(Choice choice) {

-			_choice = choice;

-		}

-		

-		public Choice getChoice() {

-			return _choice;

-		}

-		

-		public Integer getChoiceID() {

-			return _choice.getChoiceID();

-		}

-		

-		public String getMenuName() {

-			return _choice.getMenuName();

-		}

-		

-		public List<String> getVrCommands() {

-			return _choice.getVrCommands();

-		}

-		

-		public String toString() {

-			return _choice.getMenuName();

-		}

-	}

-	

-	public class SdlChoiceSet {

-		private Integer _choiceSetID = null;

-		private List<SdlChoice> _choiceSet = null;

-		

-		// Constructor

-		SdlChoiceSet(Integer choiceSetID, List<SdlChoice> choiceSet) {

-			_choiceSetID = choiceSetID;

-			_choiceSet = choiceSet;

-		}

-		

-		public Integer getChoiceSetID() {

-			return _choiceSetID;

-		}

-		

-		public List<SdlChoice> getChoiceSet() {

-			return _choiceSet;

-		}

-	}

-	

-	

-	

-

-	public OnSdlChoiceChosen() {

-		super(FunctionID.ON_SDL_CHOICE_CHOSEN.toString());

-	}

-	public OnSdlChoiceChosen(Hashtable<String, Object> hash){

-		super(hash);

-	}

-    public SdlChoice getSdlChoice() {

-    	return (SdlChoice) getParameters(KEY_SDL_CHOICE);

-    }

-    public void setSdlChoice(SdlChoice sdlChoice) {

-		setParameters(KEY_SDL_CHOICE, sdlChoice);

-    }

-    public TriggerSource getTriggerSource() {

-		return (TriggerSource) getObject(TriggerSource.class, KEY_TRIGGER_SOURCE);

-    }

-    public void setTriggerSource( TriggerSource triggerSource ) {

-		setParameters(KEY_TRIGGER_SOURCE, triggerSource);

-    }

-}

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
deleted file mode 100644
index 6c866e09a..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnStreamRPC.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.rpc;
-
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCNotification;
-
-@Deprecated
-public class OnStreamRPC extends RPCNotification {
-	public static final String KEY_FILENAME = "fileName";
-	public static final String KEY_BYTESCOMPLETE = "bytesComplete";
-	public static final String KEY_FILESIZE = "fileSize";
-	
-	public OnStreamRPC() {
-		super(FunctionID.ON_STREAM_RPC.toString());
-	}
-		
-	public void setFileName(String fileName) {
-		setParameters(KEY_FILENAME, fileName);
-	}
-	public String getFileName() {
-		return getString(KEY_FILENAME);
-	}	
-	
-	public void setBytesComplete(Long bytesComplete) {
-		setParameters(KEY_BYTESCOMPLETE, bytesComplete);
-	}
-	public Long getBytesComplete() {
-		return getLong(KEY_BYTESCOMPLETE);
-	}
-
-	public void setFileSize(Long fileSize) {
-		setParameters(KEY_FILESIZE, fileSize);
-	}
-	public Long getFileSize() {
-		return getLong(KEY_FILESIZE);
-	}
-}
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
index 66f047384..5de6c922b 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
@@ -206,9 +206,9 @@ public class OnSystemRequest extends RPCNotification {
         String result = null;

         

         try{

-            result = httpJson.getString("body");

+            result = httpJson.getString(KEY_BODY);

         }catch(JSONException e){

-            DebugTool.logError(TAG, "\"body\" key doesn't exist in bulk data.");

+            DebugTool.logError(TAG, KEY_BODY + " key doesn't exist in bulk data.");

             e.printStackTrace();

         }

         

@@ -219,27 +219,17 @@ public class OnSystemRequest extends RPCNotification {
         Headers result = null;

         

         try{

-            JSONObject httpHeadersJson = httpJson.getJSONObject("headers");

+            JSONObject httpHeadersJson = httpJson.getJSONObject(KEY_HEADERS);

             Hashtable<String, Object> httpHeadersHash = JsonRPCMarshaller.deserializeJSONObject(httpHeadersJson);

             result = new Headers(httpHeadersHash);

         }catch(JSONException e){

-            DebugTool.logError(TAG, "\"headers\" key doesn't exist in bulk data.");

+            DebugTool.logError(TAG, KEY_HEADERS + " key doesn't exist in bulk data.");

             e.printStackTrace();

         }

         

         return result;

     }

     

-    @Deprecated

-    public void setBinData(byte[] aptData) {

-        setBulkData(aptData);

-    }

-    

-    @Deprecated

-    public byte[] getBinData() {

-        return getBulkData();

-    }

-    

     @Override

     public void setBulkData(byte[] bulkData){

         super.setBulkData(bulkData);

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index e3ab2f2ff..ebf01d7c2 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -375,14 +375,6 @@ public class OnVehicleData extends RPCNotification {
     	Object object = getParameters(KEY_FUEL_LEVEL);

     	return SdlDataTypeConverter.objectToDouble(object);

     }

-    @Deprecated

-    public void setFuelLevel_State(ComponentVolumeStatus fuelLevel_State) {

-        setFuelLevelState(fuelLevel_State);

-    }

-    @Deprecated

-    public ComponentVolumeStatus getFuelLevel_State() {

-        return getFuelLevelState();

-    }

     public void setFuelLevelState(ComponentVolumeStatus fuelLevelState) {

         setParameters(KEY_FUEL_LEVEL_STATE, fuelLevelState);

     }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
index 263ed65a1..2d01d9a47 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFile.java
@@ -36,8 +36,6 @@ import androidx.annotation.NonNull;
 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCRequest;

 import com.smartdevicelink.proxy.rpc.enums.FileType;

-import com.smartdevicelink.proxy.rpc.listeners.OnPutFileUpdateListener;

-import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;

 

 import java.util.Hashtable;

 import java.util.zip.CRC32;

@@ -390,19 +388,4 @@ public class PutFile extends RPCRequest {
 		}

 		return null;

 	}

-

-	@Override

-	public final void setOnRPCResponseListener(OnRPCResponseListener listener) {

-		super.setOnRPCResponseListener(listener);

-	}

-

-	@Deprecated

-	public void setOnPutFileUpdateListener(OnPutFileUpdateListener listener) {

-		super.setOnRPCResponseListener(listener); //We can use the same method because it get stored as a parent class

-	}

-

-	@Deprecated

-	public OnPutFileUpdateListener getOnPutFileUpdateListener() {

-		return (OnPutFileUpdateListener)getOnRPCResponseListener();

-	}

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
index f0c047325..e1bf71a43 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/PutFileResponse.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

@@ -68,22 +68,6 @@ public class PutFileResponse extends RPCResponse {
     }

 

 	/**

-	 * @deprecated use {@link PutFileResponse#PutFileResponse(Boolean, Result)} <br>

-	 *

-	 * Constructs a new PutFileResponse object

-	 * @param success whether the request is successfully processed

-	 * @param resultCode whether the request is successfully processed

-	 * @param spaceAvailable the spaceAvailable on the head unit

-	 */

-	@Deprecated

-	public PutFileResponse(@NonNull Boolean success, @NonNull Result resultCode, @NonNull Integer spaceAvailable) {

-		this();

-		setSuccess(success);

-		setResultCode(resultCode);

-		setSpaceAvailable(spaceAvailable);

-	}

-

-	/**

 	 * Constructs a new PutFileResponse object

 	 * @param success whether the request is successfully processed

 	 * @param resultCode whether the request is successfully processed

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
index 862b13e4b..8ab552526 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlCapabilities.java
@@ -47,7 +47,7 @@ public class RadioControlCapabilities extends RPCStruct{
     public static final String KEY_RADIO_FREQUENCY_AVAILABLE= "radioFrequencyAvailable";
     public static final String KEY_HD_CHANNEL_AVAILABLE= "hdChannelAvailable";
     public static final String KEY_RDS_DATA_AVAILABLE= "rdsDataAvailable";
-    public static final String KEY_AVAILABLE_HDS_AVAILABLE= "availableHDsAvailable";
+    @Deprecated public static final String KEY_AVAILABLE_HDS_AVAILABLE= "availableHDsAvailable";
     public static final String KEY_STATE_AVAILABLE= "stateAvailable";
     public static final String KEY_SIGNAL_STRENGTH_AVAILABLE= "signalStrengthAvailable";
     public static final String KEY_SIGNAL_CHANGE_THRESHOLD_AVAILABLE= "signalChangeThresholdAvailable";
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
index 4de584a9f..86cd9c962 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RadioControlData.java
@@ -47,7 +47,7 @@ public class RadioControlData extends RPCStruct{
     public static final String KEY_FREQUENCY_FRACTION= "frequencyFraction";
     public static final String KEY_BAND= "band";
     public static final String KEY_RDS_DATA= "rdsData";
-    public static final String KEY_AVAILABLE_HDS= "availableHDs";
+    @Deprecated public static final String KEY_AVAILABLE_HDS= "availableHDs";
     public static final String KEY_HD_CHANNEL= "hdChannel";
     public static final String KEY_SIGNAL_STRENGTH= "signalStrength";
     public static final String KEY_SIGNAL_CHANGE_THRESHOLD= "signalChangeThreshold";
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
index a8fc1e105..449056871 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/RegisterAppInterfaceResponse.java
@@ -62,11 +62,11 @@ public class RegisterAppInterfaceResponse extends RPCResponse {
     public static final String KEY_SUPPORTED_DIAG_MODES 		= "supportedDiagModes";

     public static final String KEY_SDL_MSG_VERSION 				= "syncMsgVersion";

     public static final String KEY_LANGUAGE 					= "language";

-    public static final String KEY_BUTTON_CAPABILITIES 			= "buttonCapabilities";

-    public static final String KEY_DISPLAY_CAPABILITIES 		= "displayCapabilities";

+    @Deprecated public static final String KEY_BUTTON_CAPABILITIES 			= "buttonCapabilities";

+    @Deprecated public static final String KEY_DISPLAY_CAPABILITIES 		= "displayCapabilities";

     public static final String KEY_HMI_DISPLAY_LANGUAGE 		= "hmiDisplayLanguage";

-    public static final String KEY_SOFT_BUTTON_CAPABILITIES 	= "softButtonCapabilities";

-    public static final String KEY_PRESET_BANK_CAPABILITIES 	= "presetBankCapabilities";

+    @Deprecated public static final String KEY_SOFT_BUTTON_CAPABILITIES 	= "softButtonCapabilities";

+    @Deprecated public static final String KEY_PRESET_BANK_CAPABILITIES 	= "presetBankCapabilities";

     public static final String KEY_HMI_CAPABILITIES 			= "hmiCapabilities"; //As of v4.0

     public static final String KEY_SDL_VERSION 					= "sdlVersion"; //As of v4.0

     public static final String KEY_SYSTEM_SOFTWARE_VERSION		= "systemSoftwareVersion"; //As of v4.0

@@ -407,10 +407,7 @@ public class RegisterAppInterfaceResponse extends RPCResponse {
 	public void setPcmStreamingCapabilities(AudioPassThruCapabilities pcmStreamingCapabilities) {

 		setParameters(KEY_PCM_STREAM_CAPABILITIES, pcmStreamingCapabilities);

 	}

-	@Deprecated

-    public String getProxyVersionInfo() {

-		return null;

-    }

+

     public void setSupportedDiagModes(List<Integer> supportedDiagModes) {

 		setParameters(KEY_SUPPORTED_DIAG_MODES, supportedDiagModes);

     }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
index 522d68046..81390e64a 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetInteriorVehicleDataResponse.java
@@ -63,21 +63,6 @@ public class SetInteriorVehicleDataResponse extends RPCResponse {
 
 	/**
 	 * Constructs a new SetInteriorVehicleDataResponse object
-	 * @param moduleData
-	 * @param success whether the request is successfully processed
-	 * @param resultCode whether the request is successfully processed
-	 * @deprecated use {@link SetInteriorVehicleDataResponse#SetInteriorVehicleDataResponse(Result, Boolean)}
-	 */
-	@Deprecated
-	public SetInteriorVehicleDataResponse(@NonNull ModuleData moduleData, @NonNull Result resultCode, @NonNull Boolean success) {
-		this();
-		setModuleData(moduleData);
-		setResultCode(resultCode);
-		setSuccess(success);
-	}
-
-	/**
-	 * Constructs a new SetInteriorVehicleDataResponse object
 	 * @param success whether the request is successfully processed
 	 * @param resultCode whether the request is successfully processed
 	 */
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
index f3546dcc8..e663c9f2b 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
@@ -198,7 +198,7 @@ public class Show extends RPCRequest {
 	public static final String KEY_MAIN_FIELD_3 = "mainField3";

 	public static final String KEY_MAIN_FIELD_4 = "mainField4";

 	public static final String KEY_STATUS_BAR = "statusBar";

-	public static final String KEY_MEDIA_CLOCK = "mediaClock";

+	@Deprecated public static final String KEY_MEDIA_CLOCK = "mediaClock";

 	public static final String KEY_ALIGNMENT = "alignment";

 	public static final String KEY_MEDIA_TRACK = "mediaTrack";

 	public static final String KEY_SECONDARY_GRAPHIC = "secondaryGraphic";

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
deleted file mode 100644
index 3a39ac687..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/StreamRPCResponse.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.rpc;
-
-import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.RPCResponse;
-
-import java.util.Hashtable;
-
-@Deprecated
-public class StreamRPCResponse extends RPCResponse {
-	public static final String KEY_FILENAME = "fileName";
-	public static final String KEY_FILESIZE = "fileSize";
-	
-    public StreamRPCResponse() {
-        super(FunctionID.STREAM_RPC.toString());
-    }
-    public StreamRPCResponse(Hashtable<String, Object> hash) {
-        super(hash);
-    }
-    
-	public void setFileName(String fileName) {
-		setParameters(KEY_FILENAME, fileName);
-	}
-	public String getFileName() {
-		return getString(KEY_FILENAME);
-	}
-	
-	public void setFileSize(Long fileSize) {
-		setParameters(KEY_FILESIZE, fileSize);
-	}
-	public Long getFileSize() {
-		return getLong(KEY_FILESIZE);
-	}		
-	
-}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
index 4bdefeba9..de80be111 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java
@@ -440,29 +440,6 @@ public class SubscribeVehicleData extends RPCRequest {
     }

 

     /**

-     * Sets a boolean value. If true, subscribes fuelLevel_State data

-     * 

-     * @param fuelLevel_State

-     *            a boolean value

-     */

-    @Deprecated

-    public void setFuelLevel_State(Boolean fuelLevel_State) {

-        setFuelLevelState(fuelLevel_State);

-    }

-

-    /**

-     * Gets a boolean value. If true, means the fuelLevel_State data has been

-     * subscribed.

-     * 

-     * @return Boolean -a Boolean value. If true, means the fuelLevel_State data

-     *         has been subscribed.

-     */

-    @Deprecated

-    public Boolean getFuelLevel_State() {

-        return getFuelLevelState();

-    }

-

-    /**

      * Sets a boolean value. If true, subscribes fuelLevelState data

      * 

      * @param fuelLevelState

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
index 5a0909cd3..1c6549934 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java
@@ -166,22 +166,6 @@ public class SubscribeVehicleDataResponse extends RPCResponse {
     }

     /**

      * Sets Fuel Level State

-     * @param fuelLevel_State a VehicleDataResult related to FuelLevel State

-     */

-    @Deprecated

-    public void setFuelLevel_State(VehicleDataResult fuelLevel_State) {

-        setFuelLevel(fuelLevel_State);

-    }

-    /**

-     * Gets Fuel Level State

-     * @return a VehicleDataResult related to FuelLevel State

-     */

-    @Deprecated

-    public VehicleDataResult getFuelLevel_State() {

-        return getFuelLevelState();

-    }

-    /**

-     * Sets Fuel Level State

      * @param fuelLevelState a VehicleDataResult related to FuelLevel State

      */

     public void setFuelLevelState(VehicleDataResult fuelLevelState) {

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
index 483602b0b..2793a50e2 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java
@@ -425,29 +425,6 @@ public class UnsubscribeVehicleData extends RPCRequest {
     }

 

     /**

-     * Sets a boolean value. If true, unsubscribes from fuelLevel_State data

-     * 

-     * @param fuelLevel_State

-     *            a boolean value

-     */

-    @Deprecated

-    public void setFuelLevel_State(Boolean fuelLevel_State) {

-        setFuelLevelState(fuelLevel_State);

-    }

-

-    /**

-     * Gets a boolean value. If true, means the fuelLevel_State data has been

-     * unsubscribed.

-     * 

-     * @return Boolean -a Boolean value. If true, means the fuelLevel_State data

-     *         has been unsubscribed.

-     */

-    @Deprecated

-    public Boolean getFuelLevel_State() {

-        return getFuelLevelState();

-    }

-

-    /**

      * Sets a boolean value. If true, unsubscribes from fuelLevelState data

      * 

      * @param fuelLevelState

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
index c8e6d62d3..e6123c90f 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
@@ -168,22 +168,6 @@ public class UnsubscribeVehicleDataResponse extends RPCResponse {
     }

     /**

      * Sets Fuel Level State

-     * @param fuelLevel_State a VehicleDataResult related to FuelLevel State

-     */

-    @Deprecated

-    public void setFuelLevel_State(VehicleDataResult fuelLevel_State) {

-        setFuelLevel(fuelLevel_State);

-    }

-    /**

-     * Gets Fuel Level State

-     * @return a VehicleDataResult related to FuelLevel State

-     */

-    @Deprecated

-    public VehicleDataResult getFuelLevel_State() {

-        return getFuelLevelState();

-    }

-    /**

-     * Sets Fuel Level State

      * @param fuelLevelState a VehicleDataResult related to FuelLevel State

      */

     public void setFuelLevelState(VehicleDataResult fuelLevelState) {

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
deleted file mode 100644
index d7c36b2c5..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/SdlConnectionState.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.rpc.enums;
-
-@Deprecated
-public enum SdlConnectionState {
-	SDL_CONNECTED,
-	SDL_DISCONNECTED;
-}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
index 69fc0c8de..13d4add28 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/enums/VrCapabilities.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.proxy.rpc.enums;

 

 /**

@@ -36,15 +36,6 @@ package com.smartdevicelink.proxy.rpc.enums;
  * 

  */

 public enum VrCapabilities {

-	/**

-	 * The SDL platform is capable of recognizing spoken text in the current

-	 * language.

-	 * 

-	 * @since SmartDeviceLink 1.0

-	 */

-    @Deprecated

-	Text,

-

     /**

      * The SDL platform is capable of recognizing spoken text in the current

      * language.