PR feedback fixes

Author: noah-livio

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppCapabilityUpdatedTests.java

@@ -42,8 +42,7 @@ protected JSONObject getExpectedParameters(int sdlVersion) {
 
         try {
             result.put(OnAppCapabilityUpdated.KEY_APP_CAPABILITY, TestValues.GENERAL_APPCAPABILITY.serializeJSON());
-        }
-        catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 

android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java

@@ -228,8 +228,7 @@ public void shutDown() {
                 mCaptureThread.stopAsync();
                 try {
                     mCaptureThread.join();
-                } 
-                catch (InterruptedException e) {}
+                } catch (InterruptedException e) {}
                 mCaptureThread = null;
             }
             if (encoderThread != null) {

base/src/main/java/com/smartdevicelink/transport/SdlPsm.java

@@ -133,11 +133,11 @@ private int transitionOnInput(byte rawByte, int state) {
                 //Log.trace(TAG,"Frame Info: " + controlFrameInfo);
                 switch (frameType) {
                     case SdlPacket.FRAME_TYPE_CONTROL:
-                    /*if(frameInfo<FRAME_INFO_HEART_BEAT
-                            || (frameInfo>FRAME_INFO_END_SERVICE_ACK
-                                    && (frameInfo!=FRAME_INFO_SERVICE_DATA_ACK || frameInfo!=FRAME_INFO_HEART_BEAT_ACK))){
-                        return ERROR_STATE;
-                    }*/ //Although some bits are reserved...whatever
+                        /*if(frameInfo<FRAME_INFO_HEART_BEAT
+                                || (frameInfo>FRAME_INFO_END_SERVICE_ACK
+                                        && (frameInfo!=FRAME_INFO_SERVICE_DATA_ACK || frameInfo!=FRAME_INFO_HEART_BEAT_ACK))){
+                            return ERROR_STATE;
+                        }*/ //Although some bits are reserved...whatever
                         break;
                     case SdlPacket.FRAME_TYPE_SINGLE: //Fall through since they are both the same
                     case SdlPacket.FRAME_TYPE_FIRST: