diff options
| author | Noah Stanford <noah@livio.io> | 2022-01-10 11:48:13 -0500 |
|---|---|---|
| committer | Noah Stanford <noah@livio.io> | 2022-01-10 11:48:13 -0500 |
| commit | ff103a88b51c35813ff0a12059fb0df6d1239f2c (patch) | |
| tree | 89c74c06ed7686811c2cb4533b22e8dcb72d9919 | |
| parent | 1683adcee2a5f73564e087ab052142113c6c3ec7 (diff) | |
| download | sdl_android-ff103a88b51c35813ff0a12059fb0df6d1239f2c.tar.gz | |
Revert some excessive formatting changes
52 files changed, 210 insertions, 249 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/android/grafika/gles/OffscreenSurfaceTest.java b/android/sdl_android/src/androidTest/java/com/android/grafika/gles/OffscreenSurfaceTest.java index fc47bf6a0..24fa25579 100644 --- a/android/sdl_android/src/androidTest/java/com/android/grafika/gles/OffscreenSurfaceTest.java +++ b/android/sdl_android/src/androidTest/java/com/android/grafika/gles/OffscreenSurfaceTest.java @@ -2,9 +2,7 @@ package com.android.grafika.gles; import android.opengl.GLES20; import android.os.Environment; - import androidx.test.ext.junit.runners.AndroidJUnit4; - import android.util.Log; import org.junit.Test; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/AlertViewTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/AlertViewTest.java index 13b57e813..041d0bbed 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/AlertViewTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/AlertViewTest.java @@ -8,7 +8,6 @@ import com.smartdevicelink.managers.screen.AlertView; import com.smartdevicelink.managers.screen.SoftButtonObject; import com.smartdevicelink.managers.screen.SoftButtonState; import com.smartdevicelink.proxy.rpc.enums.FileType; - import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/AlertAudioDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/AlertAudioDataTest.java index b7ee5c469..3459c6e34 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/AlertAudioDataTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/AlertAudioDataTest.java @@ -2,17 +2,14 @@ package com.smartdevicelink.managers.screen; import android.content.Context; import android.net.Uri; - import androidx.test.ext.junit.runners.AndroidJUnit4; import com.smartdevicelink.managers.file.filetypes.SdlFile; import com.smartdevicelink.proxy.rpc.enums.FileType; import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import java.util.Collections; import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/PresentAlertOperationTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/PresentAlertOperationTest.java index db67dd7b9..5f69010f1 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/PresentAlertOperationTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/PresentAlertOperationTest.java @@ -108,7 +108,6 @@ public class PresentAlertOperationTest { }; Task task; - @Before public void setUp() throws Exception { Context mTestContext = getInstrumentation().getContext(); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java index f7c8b51c0..99eb359b4 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java @@ -209,8 +209,6 @@ public class ScreenManagerTests { SoftButtonObject softButtonObject3 = new SoftButtonObject("object1", Arrays.asList(softButtonState1, softButtonState2), softButtonState1.getName(), null); SoftButtonObject softButtonObject4 = new SoftButtonObject("object2", Arrays.asList(softButtonState3, softButtonState4), softButtonState3.getName(), null); assertTrue(screenManager.checkAndAssignButtonIds(softButtonObjects, BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER)); - - } @Test diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java index 50447ffa7..1315d2b66 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java @@ -34,7 +34,6 @@ */ package com.smartdevicelink.managers.screen.choiceset; - import androidx.test.ext.junit.runners.AndroidJUnit4; import com.livio.taskmaster.Taskmaster; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java index ab7e4e394..284f1efd5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceOperationTests.java @@ -178,13 +178,11 @@ public class MenuReplaceOperationTests { final MenuSelectionListener listener1 = new MenuSelectionListener() { @Override - public void onTriggered(TriggerSource trigger) { - } + public void onTriggered(TriggerSource trigger) {} }; final MenuSelectionListener listener2 = new MenuSelectionListener() { @Override - public void onTriggered(TriggerSource trigger) { - } + public void onTriggered(TriggerSource trigger) {} }; final MenuCell menuCell1 = new MenuCell("A", null, null, null, null, null, listener1); final MenuCell menuCell2 = new MenuCell("A", null, null, null, null, null, listener2); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java index c7cca76e9..0c7285531 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilitiesTests.java @@ -199,7 +199,7 @@ public class MenuReplaceUtilitiesTests { assertEquals(2, actualMenuCellList.get(4).getSubCells().size()); assertEquals(1, actualMenuCellList.get(4).getSubCells().get(0).getSubCells().size()); assertEquals(0, actualMenuCellList.get(4).getSubCells().get(1).getSubCells().size()); - + // Add cell c5-2-1 menuCellToAdd = newMenuList.get(0).getSubCells().get(1).getSubCells().get(0); cellAdded = MenuReplaceUtilities.addCellWithCellId(menuCellToAdd.getCellId(), 0, newMenuList, actualMenuCellList); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java index bbd0bd4b5..bd75e2440 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java @@ -234,8 +234,7 @@ public class HapticInterfaceManagerTest extends TestCase { final ViewGroup parent1 = new ViewGroup(context) { @Override - protected void onLayout(boolean b, int i, int i1, int i2, int i3) { - } + protected void onLayout(boolean b, int i, int i1, int i2, int i3) {} @Override public View getChildAt(int index) { @@ -250,8 +249,7 @@ public class HapticInterfaceManagerTest extends TestCase { final ViewGroup parent2 = new ViewGroup(context) { @Override - protected void onLayout(boolean b, int i, int i1, int i2, int i3) { - } + protected void onLayout(boolean b, int i, int i1, int i2, int i3) {} @Override public View getChildAt(int index) { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java index fffd4a60d..bdba132fc 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java @@ -318,17 +318,13 @@ public class VideoStreamManagerTests { try { sdlRemoteDisplayField = VideoStreamManager.class.getDeclaredField("sdlRemoteDisplay"); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } + } catch (NoSuchFieldException e) { e.printStackTrace(); } sdlRemoteDisplayField.setAccessible(true); SdlRemoteDisplay display = null; try { display = (SdlRemoteDisplay) sdlRemoteDisplayField.get(videoStreamManager); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } + } catch (IllegalAccessException e) { e.printStackTrace(); } display.onViewResized(100, 100); assertTrue(viewResizedCalled); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SecurityQueryIDTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SecurityQueryIDTests.java index ad6bfc721..6e1ecf762 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SecurityQueryIDTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SecurityQueryIDTests.java @@ -80,7 +80,7 @@ public class SecurityQueryIDTests extends TestCase { assertTrue("List does not match enum test list.", list.containsAll(enumTestList) && - enumTestList.containsAll(list)); + enumTestList.containsAll(list)); SecurityQueryID[] enumValueArray = SecurityQueryID.values(); SecurityQueryID[] enumTestArray = {SecurityQueryID.SEND_HANDSHAKE_DATA, SecurityQueryID.SEND_INTERNAL_ERROR, SecurityQueryID.INVALID_QUERY_ID}; diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java index 4be666d75..2fa325419 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java @@ -36,14 +36,14 @@ import static junit.framework.TestCase.fail; /** * This class tests the following * Functions & Structs - * - The classes exist in code and their names and deprecation status match the spec - * - They have constructors with mandatory params and those constructors are setting the values correctly - * - They have setter and getter for every param and their names and deprecations status match the spec - * - The params setter return instance of class type (for chainable RPCs) - * <p> + * - The classes exist in code and their names and deprecation status match the spec + * - They have constructors with mandatory params and those constructors are setting the values correctly + * - They have setter and getter for every param and their names and deprecations status match the spec + * - The params setter return instance of class type (for chainable RPCs) + * * Enums - * - The enums exist in code and their names and deprecation status match the spec - * - The enums have a value for every element in the spec and the names and deprecation status match the spec + * - The enums exist in code and their names and deprecation status match the spec + * - The enums have a value for every element in the spec and the names and deprecation status match the spec */ @RunWith(AndroidJUnit4.class) @Ignore //Remove this annotation before running these tests @@ -824,7 +824,7 @@ public class RPCGenericTests { String errMsg = rpcName + " deprecation status does not match RPC spec" + ". \n"; errors.add(errMsg); } - + // Loop through all elements for the current RPC and make sure everyone matches the RPC spec List<Element> elements = rpcAllParamsMapFromXml.get(rpcName).elements; for (int i = 0; i < elements.size(); i++) { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppCapabilityTests.java index dc2dfdfe9..66099312e 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppCapabilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppCapabilityTests.java @@ -67,19 +67,19 @@ public class AppCapabilityTests extends TestCase { if (key.equals(KEY_APP_CAPABILITY_TYPE)) { assertEquals( - TestValues.MATCH, - JsonUtils.readObjectFromJsonObject(reference, key), - JsonUtils.readObjectFromJsonObject(underTest, key) + TestValues.MATCH, + JsonUtils.readObjectFromJsonObject(reference, key), + JsonUtils.readObjectFromJsonObject(underTest, key) ); } else if (key.equals(KEY_VIDEO_STREAMING_CAPABILITY)) { JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key); Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals); assertTrue( - TestValues.TRUE, - Validator.validateVideoStreamingCapability( - TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY, new VideoStreamingCapability(hashTest) - ) + TestValues.TRUE, + Validator.validateVideoStreamingCapability( + TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY, new VideoStreamingCapability(hashTest) + ) ); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppCapabilityTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppCapabilityTypeTests.java index c19669b59..22db62763 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppCapabilityTypeTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppCapabilityTypeTests.java @@ -28,7 +28,8 @@ public class AppCapabilityTypeTests extends TestCase { try { AppCapabilityType temp = AppCapabilityType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } catch (IllegalArgumentException exception) { + } + catch (IllegalArgumentException exception) { fail("Invalid enum throws IllegalArgumentException."); } } @@ -41,7 +42,8 @@ public class AppCapabilityTypeTests extends TestCase { try { AppCapabilityType temp = AppCapabilityType.valueForString(example); assertNull("Result of valueForString should be null.", temp); - } catch (NullPointerException exception) { + } + catch (NullPointerException exception) { fail("Null string throws NullPointerException."); } } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppCapabilityUpdatedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppCapabilityUpdatedTests.java index c9717bf97..4fe7d3232 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppCapabilityUpdatedTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppCapabilityUpdatedTests.java @@ -42,7 +42,8 @@ public class OnAppCapabilityUpdatedTests extends BaseRpcTests { try { result.put(OnAppCapabilityUpdated.KEY_APP_CAPABILITY, TestValues.GENERAL_APPCAPABILITY.serializeJSON()); - } catch (JSONException e) { + } + catch (JSONException e) { fail(TestValues.JSON_FAIL); } diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java index 7d75b9701..0710c79f5 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java @@ -552,7 +552,8 @@ public class OnVehicleDataTests extends BaseRpcTests { assertTrue(TestValues.TRUE, Validator.validateGearStatuses( new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)), new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest)))); - } else if (key.equals(OnVehicleData.KEY_SEAT_OCCUPANCY)) { + } + else if (key.equals(OnVehicleData.KEY_SEAT_OCCUPANCY)) { JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key); JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key); @@ -594,7 +595,8 @@ public class OnVehicleDataTests extends BaseRpcTests { climateData2 ) ); - } else if (key.equals(OnVehicleData.KEY_WINDOW_STATUS)) { + } + else if (key.equals(OnVehicleData.KEY_WINDOW_STATUS)) { JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key); List<WindowStatus> windowStatusReferenceList = new ArrayList<>(); for (int index = 0; index < windowStatusArrayObjReference.length(); index++) { diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java index ca3475c64..4eda42042 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java @@ -29,8 +29,7 @@ public class VersionTest { try { Version version = new Version("1.2"); fail(); - } catch (Exception e) { - } + } catch (Exception e) {} } @Test diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java index e06efda8e..b2e90c246 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java @@ -24,7 +24,7 @@ import static junit.framework.TestCase.assertTrue; @RunWith(AndroidJUnit4.class) public class TransportBrokerTest { //FIXME this test class needs to be fixed. At this point these tests are not helpful RouterServiceValidator rsvp; - // public TransportBrokerThread(Context context, String appId, ComponentName service){ + // public TransportBrokerThread(Context context, String appId, ComponentName service){ @Before public void setUp() throws Exception { diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/Drawable2d.java b/android/sdl_android/src/main/java/com/android/grafika/gles/Drawable2d.java index c25e84d28..4820e6a7d 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/Drawable2d.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/Drawable2d.java @@ -28,14 +28,14 @@ public class Drawable2d { * Simple equilateral triangle (1.0 per side). Centered on (0,0). */ private static final float TRIANGLE_COORDS[] = { - 0.0f, 0.577350269f, // 0 top - -0.5f, -0.288675135f, // 1 bottom left - 0.5f, -0.288675135f // 2 bottom right + 0.0f, 0.577350269f, // 0 top + -0.5f, -0.288675135f, // 1 bottom left + 0.5f, -0.288675135f // 2 bottom right }; private static final float TRIANGLE_TEX_COORDS[] = { - 0.5f, 0.0f, // 0 top center - 0.0f, 1.0f, // 1 bottom left - 1.0f, 1.0f, // 2 bottom right + 0.5f, 0.0f, // 0 top center + 0.0f, 1.0f, // 1 bottom left + 1.0f, 1.0f, // 2 bottom right }; private static final FloatBuffer TRIANGLE_BUF = GlUtil.createFloatBuffer(TRIANGLE_COORDS); @@ -49,16 +49,16 @@ public class Drawable2d { * Triangles are 0-1-2 and 2-1-3 (counter-clockwise winding). */ private static final float RECTANGLE_COORDS[] = { - -0.5f, -0.5f, // 0 bottom left - 0.5f, -0.5f, // 1 bottom right - -0.5f, 0.5f, // 2 top left - 0.5f, 0.5f, // 3 top right + -0.5f, -0.5f, // 0 bottom left + 0.5f, -0.5f, // 1 bottom right + -0.5f, 0.5f, // 2 top left + 0.5f, 0.5f, // 3 top right }; private static final float RECTANGLE_TEX_COORDS[] = { - 0.0f, 1.0f, // 0 bottom left - 1.0f, 1.0f, // 1 bottom right - 0.0f, 0.0f, // 2 top left - 1.0f, 0.0f // 3 top right + 0.0f, 1.0f, // 0 bottom left + 1.0f, 1.0f, // 1 bottom right + 0.0f, 0.0f, // 2 top left + 1.0f, 0.0f // 3 top right }; private static final FloatBuffer RECTANGLE_BUF = GlUtil.createFloatBuffer(RECTANGLE_COORDS); @@ -73,16 +73,16 @@ public class Drawable2d { * right with external textures from SurfaceTexture.) */ private static final float FULL_RECTANGLE_COORDS[] = { - -1.0f, -1.0f, // 0 bottom left - 1.0f, -1.0f, // 1 bottom right - -1.0f, 1.0f, // 2 top left - 1.0f, 1.0f, // 3 top right + -1.0f, -1.0f, // 0 bottom left + 1.0f, -1.0f, // 1 bottom right + -1.0f, 1.0f, // 2 top left + 1.0f, 1.0f, // 3 top right }; private static final float FULL_RECTANGLE_TEX_COORDS[] = { - 0.0f, 0.0f, // 0 bottom left - 1.0f, 0.0f, // 1 bottom right - 0.0f, 1.0f, // 2 top left - 1.0f, 1.0f // 3 top right + 0.0f, 0.0f, // 0 bottom left + 1.0f, 0.0f, // 1 bottom right + 0.0f, 1.0f, // 2 top left + 1.0f, 1.0f // 3 top right }; private static final FloatBuffer FULL_RECTANGLE_BUF = GlUtil.createFloatBuffer(FULL_RECTANGLE_COORDS); diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/EglCore.java b/android/sdl_android/src/main/java/com/android/grafika/gles/EglCore.java index 16b09e056..b714f58b0 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/EglCore.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/EglCore.java @@ -69,9 +69,8 @@ public final class EglCore { /** * Prepares EGL display and context. * <p> - * * @param sharedContext The context to share, or null if sharing is not desired. - * @param flags Configuration bit flags, e.g. FLAG_RECORDABLE. + * @param flags Configuration bit flags, e.g. FLAG_RECORDABLE. */ public EglCore(EGLContext sharedContext, int flags) { if (mEGLDisplay != EGL14.EGL_NO_DISPLAY) { @@ -140,7 +139,7 @@ public final class EglCore { /** * Finds a suitable EGLConfig. * - * @param flags Bit flags from constructor. + * @param flags Bit flags from constructor. * @param version Must be 2 or 3. */ private EGLConfig getConfig(int flags, int version) { @@ -321,7 +320,7 @@ public final class EglCore { */ public boolean isCurrent(EGLSurface eglSurface) { return mEGLContext.equals(EGL14.eglGetCurrentContext()) && - eglSurface.equals(EGL14.eglGetCurrentSurface(EGL14.EGL_DRAW)); + eglSurface.equals(EGL14.eglGetCurrentSurface(EGL14.EGL_DRAW)); } /** diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/EglSurfaceBase.java b/android/sdl_android/src/main/java/com/android/grafika/gles/EglSurfaceBase.java index fd6045150..6553dbc31 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/EglSurfaceBase.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/EglSurfaceBase.java @@ -51,7 +51,6 @@ public class EglSurfaceBase { /** * Creates a window surface. * <p> - * * @param surface May be a Surface or SurfaceTexture. */ public void createWindowSurface(Object surface) { diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/FullFrameRect.java b/android/sdl_android/src/main/java/com/android/grafika/gles/FullFrameRect.java index aef768d86..74c8dac44 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/FullFrameRect.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/FullFrameRect.java @@ -30,7 +30,7 @@ public class FullFrameRect { * Prepares the object. * * @param program The program to use. FullFrameRect takes ownership, and will release - * the program when no longer needed. + * the program when no longer needed. */ public FullFrameRect(Texture2dProgram program) { mProgram = program; diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/GlUtil.java b/android/sdl_android/src/main/java/com/android/grafika/gles/GlUtil.java index d92a1cf12..40a959c0a 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/GlUtil.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/GlUtil.java @@ -31,11 +31,8 @@ import java.nio.FloatBuffer; public class GlUtil { private static final String TAG = "GlUtil"; - /** - * Identity matrix for general use. Don't modify or life will get weird. - */ + /** Identity matrix for general use. Don't modify or life will get weird. */ public static final float[] IDENTITY_MATRIX; - static { IDENTITY_MATRIX = new float[16]; Matrix.setIdentityM(IDENTITY_MATRIX, 0); @@ -44,8 +41,7 @@ public class GlUtil { private static final int SIZEOF_FLOAT = 4; - private GlUtil() { - } // do not instantiate + private GlUtil() {} // do not instantiate /** * Creates a new program from the supplied vertex and fragment shaders. @@ -131,8 +127,8 @@ public class GlUtil { /** * Creates a texture from raw data. * - * @param data Image data, in a "direct" ByteBuffer. - * @param width Texture width, in pixels (not bytes). + * @param data Image data, in a "direct" ByteBuffer. + * @param width Texture width, in pixels (not bytes). * @param height Texture height, in pixels. * @param format Image data format (use constant appropriate for glTexImage2D(), e.g. GL_RGBA). * @return Handle to texture. diff --git a/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java b/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java index 542c0f1db..7e18d1adf 100644 --- a/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java +++ b/android/sdl_android/src/main/java/com/android/grafika/gles/Texture2dProgram.java @@ -36,46 +36,46 @@ public class Texture2dProgram { // Simple vertex shader, used for all programs. private static final String VERTEX_SHADER = "uniform mat4 uMVPMatrix;\n" + - "uniform mat4 uTexMatrix;\n" + - "attribute vec4 aPosition;\n" + - "attribute vec4 aTextureCoord;\n" + - "varying vec2 vTextureCoord;\n" + - "void main() {\n" + - " gl_Position = uMVPMatrix * aPosition;\n" + - " vTextureCoord = (uTexMatrix * aTextureCoord).xy;\n" + - "}\n"; + "uniform mat4 uTexMatrix;\n" + + "attribute vec4 aPosition;\n" + + "attribute vec4 aTextureCoord;\n" + + "varying vec2 vTextureCoord;\n" + + "void main() {\n" + + " gl_Position = uMVPMatrix * aPosition;\n" + + " vTextureCoord = (uTexMatrix * aTextureCoord).xy;\n" + + "}\n"; // Simple fragment shader for use with "normal" 2D textures. private static final String FRAGMENT_SHADER_2D = "precision mediump float;\n" + - "varying vec2 vTextureCoord;\n" + - "uniform sampler2D sTexture;\n" + - "void main() {\n" + - " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" + - "}\n"; + "varying vec2 vTextureCoord;\n" + + "uniform sampler2D sTexture;\n" + + "void main() {\n" + + " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" + + "}\n"; // Simple fragment shader for use with external 2D textures (e.g. what we get from // SurfaceTexture). private static final String FRAGMENT_SHADER_EXT = "#extension GL_OES_EGL_image_external : require\n" + - "precision mediump float;\n" + - "varying vec2 vTextureCoord;\n" + - "uniform samplerExternalOES sTexture;\n" + - "void main() {\n" + - " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" + - "}\n"; + "precision mediump float;\n" + + "varying vec2 vTextureCoord;\n" + + "uniform samplerExternalOES sTexture;\n" + + "void main() {\n" + + " gl_FragColor = texture2D(sTexture, vTextureCoord);\n" + + "}\n"; // Fragment shader that converts color to black & white with a simple transformation. private static final String FRAGMENT_SHADER_EXT_BW = "#extension GL_OES_EGL_image_external : require\n" + - "precision mediump float;\n" + - "varying vec2 vTextureCoord;\n" + - "uniform samplerExternalOES sTexture;\n" + - "void main() {\n" + - " vec4 tc = texture2D(sTexture, vTextureCoord);\n" + - " float color = tc.r * 0.3 + tc.g * 0.59 + tc.b * 0.11;\n" + - " gl_FragColor = vec4(color, color, color, 1.0);\n" + - "}\n"; + "precision mediump float;\n" + + "varying vec2 vTextureCoord;\n" + + "uniform samplerExternalOES sTexture;\n" + + "void main() {\n" + + " vec4 tc = texture2D(sTexture, vTextureCoord);\n" + + " float color = tc.r * 0.3 + tc.g * 0.59 + tc.b * 0.11;\n" + + " gl_FragColor = vec4(color, color, color, 1.0);\n" + + "}\n"; // Fragment shader with a convolution filter. The upper-left half will be drawn normally, // the lower-right half will have the filter applied, and a thin red line will be drawn @@ -90,29 +90,29 @@ public class Texture2dProgram { public static final int KERNEL_SIZE = 9; private static final String FRAGMENT_SHADER_EXT_FILT = "#extension GL_OES_EGL_image_external : require\n" + - "#define KERNEL_SIZE " + KERNEL_SIZE + "\n" + - "precision highp float;\n" + - "varying vec2 vTextureCoord;\n" + - "uniform samplerExternalOES sTexture;\n" + - "uniform float uKernel[KERNEL_SIZE];\n" + - "uniform vec2 uTexOffset[KERNEL_SIZE];\n" + - "uniform float uColorAdjust;\n" + - "void main() {\n" + - " int i = 0;\n" + - " vec4 sum = vec4(0.0);\n" + - " if (vTextureCoord.x < vTextureCoord.y - 0.005) {\n" + - " for (i = 0; i < KERNEL_SIZE; i++) {\n" + - " vec4 texc = texture2D(sTexture, vTextureCoord + uTexOffset[i]);\n" + - " sum += texc * uKernel[i];\n" + - " }\n" + - " sum += uColorAdjust;\n" + - " } else if (vTextureCoord.x > vTextureCoord.y + 0.005) {\n" + - " sum = texture2D(sTexture, vTextureCoord);\n" + - " } else {\n" + - " sum.r = 1.0;\n" + - " }\n" + - " gl_FragColor = sum;\n" + - "}\n"; + "#define KERNEL_SIZE " + KERNEL_SIZE + "\n" + + "precision highp float;\n" + + "varying vec2 vTextureCoord;\n" + + "uniform samplerExternalOES sTexture;\n" + + "uniform float uKernel[KERNEL_SIZE];\n" + + "uniform vec2 uTexOffset[KERNEL_SIZE];\n" + + "uniform float uColorAdjust;\n" + + "void main() {\n" + + " int i = 0;\n" + + " vec4 sum = vec4(0.0);\n" + + " if (vTextureCoord.x < vTextureCoord.y - 0.005) {\n" + + " for (i = 0; i < KERNEL_SIZE; i++) {\n" + + " vec4 texc = texture2D(sTexture, vTextureCoord + uTexOffset[i]);\n" + + " sum += texc * uKernel[i];\n" + + " }\n" + + " sum += uColorAdjust;\n" + + " } else if (vTextureCoord.x > vTextureCoord.y + 0.005) {\n" + + " sum = texture2D(sTexture, vTextureCoord);\n" + + " } else {\n" + + " sum.r = 1.0;\n" + + " }\n" + + " gl_FragColor = sum;\n" + + "}\n"; private ProgramType mProgramType; @@ -263,9 +263,9 @@ public class Texture2dProgram { // Don't need to create a new array here, but it's syntactically convenient. mTexOffset = new float[]{ - -rw, -rh, 0f, -rh, rw, -rh, - -rw, 0f, 0f, 0f, rw, 0f, - -rw, rh, 0f, rh, rw, rh + -rw, -rh, 0f, -rh, rw, -rh, + -rw, 0f, 0f, 0f, rw, 0f, + -rw, rh, 0f, rh, rw, rh }; Log.d(TAG, "filt size: " + width + "x" + height + ": " + Arrays.toString(mTexOffset)); } @@ -273,21 +273,21 @@ public class Texture2dProgram { /** * Issues the draw call. Does the full setup on every call. * - * @param mvpMatrix The 4x4 projection matrix. - * @param vertexBuffer Buffer with vertex position data. - * @param firstVertex Index of first vertex to use in vertexBuffer. - * @param vertexCount Number of vertices in vertexBuffer. + * @param mvpMatrix The 4x4 projection matrix. + * @param vertexBuffer Buffer with vertex position data. + * @param firstVertex Index of first vertex to use in vertexBuffer. + * @param vertexCount Number of vertices in vertexBuffer. * @param coordsPerVertex The number of coordinates per vertex (e.g. x,y is 2). - * @param vertexStride Width, in bytes, of the position data for each vertex (often - * vertexCount * sizeof(float)). - * @param texMatrix A 4x4 transformation matrix for texture coords. (Primarily intended - * for use with SurfaceTexture.) - * @param texBuffer Buffer with vertex texture data. - * @param texStride Width, in bytes, of the texture data for each vertex. + * @param vertexStride Width, in bytes, of the position data for each vertex (often + * vertexCount * sizeof(float)). + * @param texMatrix A 4x4 transformation matrix for texture coords. (Primarily intended + * for use with SurfaceTexture.) + * @param texBuffer Buffer with vertex texture data. + * @param texStride Width, in bytes, of the texture data for each vertex. */ public void draw(float[] mvpMatrix, FloatBuffer vertexBuffer, int firstVertex, - int vertexCount, int coordsPerVertex, int vertexStride, - float[] texMatrix, FloatBuffer texBuffer, int textureId, int texStride) { + int vertexCount, int coordsPerVertex, int vertexStride, + float[] texMatrix, FloatBuffer texBuffer, int textureId, int texStride) { GlUtil.checkGlError("draw start"); // Select the program. @@ -312,7 +312,7 @@ public class Texture2dProgram { // Connect vertexBuffer to "aPosition". GLES20.glVertexAttribPointer(maPositionLoc, coordsPerVertex, - GLES20.GL_FLOAT, false, vertexStride, vertexBuffer); + GLES20.GL_FLOAT, false, vertexStride, vertexBuffer); GlUtil.checkGlError("glVertexAttribPointer"); // Enable the "aTextureCoord" vertex attribute. diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java index a7614624a..7ff28b153 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java @@ -135,7 +135,6 @@ public class VirtualDisplayEncoder { /** * setter of every parameter in streamingParams. - * * @param displayDensity * @param resolution * @param frameRate @@ -229,9 +228,8 @@ public class VirtualDisplayEncoder { mCaptureThread.stopAsync(); try { mCaptureThread.join(); - } catch (InterruptedException e) { - - } + } + catch (InterruptedException e) {} mCaptureThread = null; } if (encoderThread != null) { @@ -261,7 +259,6 @@ public class VirtualDisplayEncoder { /** * setupGLES: create offscreen surface and surface texture. - * * @param Width * @param Height */ diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java index add04d9a6..92a396f85 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java @@ -389,7 +389,7 @@ public class SdlManager extends BaseSdlManager { } } - ISdl _internalInterface = new ISdl() { + ISdl _internalInterface = new ISdl() { @Override public void start() { lifecycleManager.getInternalInterface(SdlManager.this).start(); @@ -492,10 +492,10 @@ public class SdlManager extends BaseSdlManager { return lifecycleManager.getInternalInterface(SdlManager.this).getProtocolVersion(); } - @Override - public long getMtu(SessionType serviceType) { - return lifecycleManager.getInternalInterface(SdlManager.this).getMtu(serviceType); - } + @Override + public long getMtu(SessionType serviceType) { + return lifecycleManager.getInternalInterface(SdlManager.this).getMtu(serviceType); + } @Override public void startRPCEncryption() { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java index 0c11ee686..fe06561ee 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java @@ -73,7 +73,6 @@ public interface SdlManagerListener extends BaseSdlManagerListener { /** * A way to determine if this SDL session should continue to be active while * connected to the determined system information of the vehicle. - * * @param systemInfo systemInfo - the system information of the vehicle that this session is currently active on. * @return Return true if this session should continue, false if the session should end */ diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java index d77ab8bea..6a69f84ba 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java @@ -51,12 +51,12 @@ public class AudioDecoderCompat extends BaseAudioDecoder { /** * Creates a new object of AudioDecoder. * - * @param transactionQueue The operation queue that can be used to run operations in order. - * @param audioSource The audio source to decode. - * @param context The context object to use to open the audio source. - * @param sampleRate The desired sample rate for decoded audio data. - * @param sampleType The desired sample type (8bit, 16bit, float). - * @param listener A listener who receives the decoded audio. + * @param transactionQueue The operation queue that can be used to run operations in order. + * @param audioSource The audio source to decode. + * @param context The context object to use to open the audio source. + * @param sampleRate The desired sample rate for decoded audio data. + * @param sampleType The desired sample type (8bit, 16bit, float). + * @param listener A listener who receives the decoded audio. */ AudioDecoderCompat(@NonNull Queue transactionQueue, @NonNull Uri audioSource, @NonNull Context context, int sampleRate, @SampleType int sampleType, AudioDecoderListener listener) { super(audioSource, context, sampleRate, sampleType, listener); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java index d159667c9..21758d47e 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java @@ -157,9 +157,9 @@ public class LifecycleManager extends BaseLifecycleManager { * This method will try to start the video service with the requested parameters. * When it returns it will attempt to store the accepted parameters if available. * - * @param isEncrypted if the service should be encrypted + * @param isEncrypted if the service should be encrypted * @param afterPendingRestart specify true when the videoService is starting again after the display has been resized - * @param parameters the desired video streaming parameters + * @param parameters the desired video streaming parameters */ @Override void startVideoService(boolean isEncrypted, VideoStreamingParameters parameters, boolean afterPendingRestart) { @@ -180,9 +180,9 @@ public class LifecycleManager extends BaseLifecycleManager { * Try to open a video service by using the video streaming parameters supplied. * Only information from codecs, width and height are used during video format negotiation. * - * @param isEncrypted Specify true if packets on this service have to be encrypted + * @param isEncrypted Specify true if packets on this service have to be encrypted * @param afterPendingRestart specify true when the videoService is starting again after the display has been resized - * @param parameters VideoStreamingParameters that are desired. Does not guarantee this is what will be accepted. + * @param parameters VideoStreamingParameters that are desired. Does not guarantee this is what will be accepted. */ private void tryStartVideoStream(boolean isEncrypted, VideoStreamingParameters parameters, boolean afterPendingRestart) { if (session == null) { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/AlertManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/AlertManager.java index 4214a2112..c0a5d92e2 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/AlertManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/AlertManager.java @@ -41,7 +41,7 @@ import com.smartdevicelink.managers.file.FileManager; /** * <strong>AlertManager</strong> <br> * <p> - * Alert manager handles uploading images and audio needed by an alert, sending an alert and cancelling an alert.<br> + * Alert manager handles uploading images and audio needed by an alert, sending an alert and cancelling an alert.<br> * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br> */ @RestrictTo(RestrictTo.Scope.LIBRARY) diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java index 91d374ebb..dc91e65c2 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java @@ -219,7 +219,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { private final OnSystemCapabilityListener systemCapabilityListener = new OnSystemCapabilityListener() { @Override public void onCapabilityRetrieved(Object capability) { - VideoStreamingParameters params = (parameters == null) ? new VideoStreamingParameters() : new VideoStreamingParameters(parameters); + VideoStreamingParameters params = (parameters == null) ? new VideoStreamingParameters() : new VideoStreamingParameters(parameters); VideoStreamingCapability castedCapability = ((VideoStreamingCapability) capability); @@ -334,19 +334,20 @@ public class VideoStreamManager extends BaseVideoStreamManager { * If the module's screen size for your app changes during streaming (i.e. to a collapsed view, split screen, preview mode, or picture-in-picture), your remoteDisplay will be resized to the new screen size. * If either range is `null`, the default is to support all streaming ranges of that format (landscape or portrait). * If you wish to disable support for streaming in a given format (landscape or portrait), set a VideoStreamingRange with all `0` values. - * <p> + * * NOTE If both supportedLandscapeStreamingRange and supportedLandscapeStreamingRange are disabled then the video will not stream. - * <p> + * * Any changes to screen size will notify the onViewResized method you have implemented in your remoteDisplay class. * - * @param context a context that can be used to create the remote display - * @param remoteDisplayClass class object of the remote display. This class will be used to create an instance of the remote display and will be projected to the module - * @param parameters streaming parameters to be used when streaming. If null is sent in, the default/optimized options will be used. - * If you are unsure about what parameters to be used it is best to just send null and let the system determine what - * works best for the currently connected module. - * @param encrypted a flag of if the stream should be encrypted. Only set if you have a supplied encryption library that the module can understand. - * @param supportedLandscapeStreamingRange constraints for vehicle display : min/max aspect ratio, min/max resolutions, max diagonal size. - * @param supportedPortraitStreamingRange constraints for vehicle display : min/max aspect ratio, min/max resolutions, max diagonal size. + * + * @param context a context that can be used to create the remote display + * @param remoteDisplayClass class object of the remote display. This class will be used to create an instance of the remote display and will be projected to the module + * @param parameters streaming parameters to be used when streaming. If null is sent in, the default/optimized options will be used. + * If you are unsure about what parameters to be used it is best to just send null and let the system determine what + * works best for the currently connected module. + * @param encrypted a flag of if the stream should be encrypted. Only set if you have a supplied encryption library that the module can understand. + * @param supportedLandscapeStreamingRange constraints for vehicle display : min/max aspect ratio, min/max resolutions, max diagonal size. + * @param supportedPortraitStreamingRange constraints for vehicle display : min/max aspect ratio, min/max resolutions, max diagonal size. */ public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, final boolean encrypted, VideoStreamingRange supportedLandscapeStreamingRange, VideoStreamingRange supportedPortraitStreamingRange) { configureGlobalParameters(context, remoteDisplayClass, encrypted, supportedPortraitStreamingRange, supportedLandscapeStreamingRange); @@ -662,7 +663,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { createTouchScalar(resolution, displayMetrics); } - VideoStreamManager.this.remoteDisplay.resizeView(parameters.getResolution().getResolutionWidth(), parameters.getResolution().getResolutionHeight()); + VideoStreamManager.this.remoteDisplay.resizeView(parameters.getResolution().getResolutionWidth(), parameters.getResolution().getResolutionHeight()); } @Override diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java index 6ababed24..2eea57b98 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java @@ -78,7 +78,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport { Runnable socketRunnable; boolean keepSocketAlive = true; BluetoothDevice connectedDevice; - + /** * Constructor. Prepares a new BluetoothChat session. * @@ -115,7 +115,6 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport { /** * A method to retrieve the currently connected bluetooth device - * * @return the connected bluetooth device if connected, null otherwise. */ public BluetoothDevice getConnectedDevice() { diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java index 2df937b58..81f91bd0f 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java @@ -233,8 +233,8 @@ public class RouterServiceValidator { * @param context */ //private void retrieveBestRouterServiceName(Context context) { - // FindRouterTask task = new FindRouterTask(null); - // task.execute(context); + // FindRouterTask task = new FindRouterTask(null); + // task.execute(context); //} /** diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index 030259bd8..63defad61 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -1692,7 +1692,7 @@ public class SdlRouterService extends Service { } /** - * 1. If the app has SDL shut off, shut down + * 1. If the app has SDL shut off, shut down * 2. if The app has an Alt Transport address or was started by one, stay open * 3. If Bluetooth is off/NA shut down * 4. Anything else diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java index 276b5deb7..6c3050301 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java @@ -427,7 +427,6 @@ public class TransportManager extends TransportManagerBase { /** * A synchronized method to exit out of legacy mode - * * @param info if this is null, the transport listener callback will not be called */ @Override diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java index 8f7eb6233..237d7c2dd 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java @@ -49,7 +49,6 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.BatteryManager; import android.os.Bundle; - import androidx.annotation.Nullable; import com.smartdevicelink.marshal.JsonRPCMarshaller; @@ -274,9 +273,9 @@ public class AndroidTools { /** * Saves the mac address along with vehicle details into user's shared prefs. * - * @param context a context instance to obtain the shared preferences. + * @param context a context instance to obtain the shared preferences. * @param vehicleType a RPCStruct that describes the type of vehicle the mobile phone is connected with. - * @param address a string containing the Bluetooth Mac address of the connected vehicle. + * @param address a string containing the Bluetooth Mac address of the connected vehicle. */ public static void saveVehicleType(Context context, VehicleType vehicleType, String address) { synchronized (VEHICLE_PREF_LOCK) { @@ -304,8 +303,7 @@ public class AndroidTools { * @param address a string containing the Bluetooth Mac address of the connected vehicle. * @return The Hashtable to be used to construct VehicleTyp */ - public static @Nullable - Hashtable<String, Object> getVehicleTypeFromPrefs(Context context, String address) { + public static @Nullable Hashtable<String, Object> getVehicleTypeFromPrefs(Context context, String address) { synchronized (VEHICLE_PREF_LOCK) { if (context == null || address == null) { DebugTool.logWarning(TAG, String.format("Unable to get vehicle type from prefs. Context is %1$s and Address is %2$s", context, address)); @@ -331,13 +329,12 @@ public class AndroidTools { /** * Retrieves the list of vehicle types that are set in the manifest. * - * @param context a context to access Android system services through. - * @param component a component name of a LocalRouterService. + * @param context a context to access Android system services through. + * @param component a component name of a LocalRouterService. * @param manifestFieldId a string resources id that indicates an unique name for the vehicle data in the manifest. * @return The list of vehicle types, or null if an error occurred or field was not found. */ - public static @Nullable - List<VehicleType> getVehicleTypesFromManifest(Context context, ComponentName component, int manifestFieldId) { + public static @Nullable List<VehicleType> getVehicleTypesFromManifest(Context context, ComponentName component, int manifestFieldId) { if (context == null || component == null) { DebugTool.logWarning(TAG, String.format("Unable to get vehicle type from manifest. Context is %1$s and Component is %2$s", context, component)); return null; diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java index 192a78773..bfdec946e 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java @@ -267,7 +267,7 @@ public class SdlAppInfo { * Check to see if a vehicle type is supported. * * @param supportedVehicleList the list of supported vehicle types. - * @param connectedVehicle the vehicle type to check. + * @param connectedVehicle the vehicle type to check. * @return true if vehicle type is supported. */ public static boolean checkIfVehicleSupported(List<VehicleType> supportedVehicleList, VehicleType connectedVehicle) { diff --git a/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java b/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java index b15315603..7801632ba 100644 --- a/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/AlertCompletionListener.java @@ -4,8 +4,7 @@ public interface AlertCompletionListener { /** * Returns whether an Alert operation was successful or not along with tryAgainTime - * - * @param success - Boolean that is True if Operation was a success, False otherwise. + * @param success - Boolean that is True if Operation was a success, False otherwise. * @param tryAgainTime - Amount of time (in seconds) that an app must wait before resending an alert. */ void onComplete(boolean success, Integer tryAgainTime); diff --git a/base/src/main/java/com/smartdevicelink/managers/ISdl.java b/base/src/main/java/com/smartdevicelink/managers/ISdl.java index 2c55afbaa..94b9f0842 100644 --- a/base/src/main/java/com/smartdevicelink/managers/ISdl.java +++ b/base/src/main/java/com/smartdevicelink/managers/ISdl.java @@ -89,8 +89,8 @@ public interface ISdl { /** * Starts the video streaming service * - * @param parameters desired video streaming params for this service to be started with - * @param encrypted flag to start this service with encryption or not + * @param parameters desired video streaming params for this service to be started with + * @param encrypted flag to start this service with encryption or not * @param withPendingRestart flag to start this service right after OnSystemCapabilityUpdated */ void startVideoService(VideoStreamingParameters parameters, boolean encrypted, boolean withPendingRestart); 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 2f0872d55..0847d5d7c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -1272,7 +1272,6 @@ abstract class BaseLifecycleManager { /** * Using the vehicle type information, specifically the make, the library will attempt to init * the security library that is associated with that OEM. - * * @param vehicleType type of vehicle that is currently connected */ private void setSecurityLibraryIfAvailable(VehicleType vehicleType) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java b/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java index 4d0076014..f69011170 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/AlertView.java @@ -98,7 +98,7 @@ public class AlertView implements Cloneable { * Timeout in seconds. Defaults to 0, which will use `defaultTimeout`. If this is set below the * minimum, it will be capped at 3 seconds. Minimum 3 seconds, maximum 10 seconds. If this is * set above the maximum, it will be capped at 10 seconds. Defaults to 0. - * <p> + * * Please note that if a button is added to the alert, the defaultTimeout and timeout values will be ignored. */ public Builder setTimeout(Integer timeout) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java index 51bf5d2bb..10db9c54c 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseAlertManager.java @@ -95,7 +95,6 @@ abstract class BaseAlertManager extends BaseSubManager { /** * Starts the manager - * * @param listener CompletionListener that is called once the BaseSubManager's state is READY, LIMITED, or ERROR */ @Override diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java index 7a55d5e18..4372cda9f 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -738,7 +738,7 @@ abstract class BaseScreenManager extends BaseSubManager { * Used across managers to check and assign SoftButton ID's to prevent conflicts. * * @param softButtonObjects - list of SoftButtonObjects - * @param location - location from which the button came from, so if new buttons get set on screen, we can clear the old ID's out + * @param location - location from which the button came from, so if new buttons get set on screen, we can clear the old ID's out * @return True if ButtonID's are good, False if not. */ static boolean checkAndAssignButtonIds(List<SoftButtonObject> softButtonObjects, @ManagerLocation int location) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java index b2e727885..4d93be501 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java @@ -298,7 +298,7 @@ abstract class BaseSoftButtonManager extends BaseSubManager { return; } - if (!BaseScreenManager.checkAndAssignButtonIds(softButtonObjects, BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER)) { + if (!BaseScreenManager.checkAndAssignButtonIds(softButtonObjects, BaseScreenManager.ManagerLocation.SOFTBUTTON_MANAGER)) { DebugTool.logError(TAG, "Attempted to set soft button objects, but multiple buttons had the same id"); return; } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java index f2085bd42..29db76742 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/PresentAlertOperation.java @@ -62,7 +62,7 @@ import java.util.Map; /** * Operation that handles uploading images and audio data needed by the alert and, once the data uploads are complete, sending the alert. - * <p> + * * Created by Julian Kast on 12/10/20. */ public class PresentAlertOperation extends Task { @@ -156,7 +156,6 @@ public class PresentAlertOperation extends Task { /** * Checks the `AlertView` data to make sure it conforms to the RPC Spec, which says that at least either `alertText1`, `alertText2` or `TTSChunks` need to be provided. - * * @param alertView - Alert data that needs to be presented * @return true if AlertView data conforms to RPC Spec */ @@ -396,7 +395,6 @@ public class PresentAlertOperation extends Task { /** * Checks if AudioFiles are supported by module and removes them form audioData list if they are not - * * @param alertView * @return List of ttsChunks */ diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java index 2ae8371e8..d38cf9713 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java @@ -68,10 +68,10 @@ public class ChoiceSet { /** * Initialize with a title, listener, and choices. It will use the default timeout and layout, * all other properties (such as prompts) will be `null`. - * <p> - * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. - * <p> - * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. + * + * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. + * + * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. * * @param title - The choice set's title * @param listener - The choice set listener called after the user has interacted with your choice set @@ -93,10 +93,10 @@ public class ChoiceSet { /** * Constructor with all possible properties. - * <p> - * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. - * <p> - * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. + * + * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. + * + * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. * * @param title - The choice set's title * @param listener - The choice set listener called after the user has interacted with your choice set @@ -138,10 +138,10 @@ public class ChoiceSet { /** * Constructor with all possible properties. - * <p> - * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. - * <p> - * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. + * + * NOTE: If you display multiple cells with the same `text` with the only uniquing property between cells being different `vrCommands` or a feature that is not displayed on the head unit (e.g. if the head unit doesn't display `secondaryArtwork` and that's the only uniquing property between two cells) then the cells may appear to be the same to the user in `Manual` mode. This only applies to RPC connections >= 7.1.0. + * + * NOTE: On < 7.1.0 connections, the `text` cell will be automatically modified among cells that have the same `text` when they are preloaded, so they will always appear differently on-screen when they are displayed. `choiceCell.uniqueText` will be created by appending ` (2)`, ` (3)`, etc. * * @param title - The choice set's title * @param listener - The choice set listener called after the user has interacted with your choice set @@ -320,7 +320,7 @@ public class ChoiceSet { * If this is set above the maximum, it will be capped at 100 seconds. */ public void setTimeout(Integer timeout) { - this.timeout = timeout; + this.timeout = timeout; } public int getDefaultTimeout() { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java index fd3dc9792..2eb04342e 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java @@ -40,10 +40,8 @@ import androidx.annotation.NonNull; import com.livio.taskmaster.Task; import com.smartdevicelink.managers.CompletionListener; import com.smartdevicelink.managers.ISdl; - import static com.smartdevicelink.managers.ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName; import static com.smartdevicelink.managers.ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName; - import com.smartdevicelink.managers.file.FileManager; import com.smartdevicelink.managers.file.MultipleFileCompletionListener; import com.smartdevicelink.managers.file.filetypes.SdlArtwork; @@ -112,7 +110,7 @@ class PreloadPresentChoicesOperation extends Task { Integer selectedCellRow; KeyboardListener keyboardListener; final SdlMsgVersion sdlMsgVersion; - + private enum SDLPreloadPresentChoicesOperationState { NOT_STARTED, UPLOADING_IMAGES, diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java index 23e815a57..aea0d10d6 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdateAlgorithm.java @@ -110,7 +110,6 @@ class DynamicMenuUpdateAlgorithm { /** * Builds a 1-1 list of Deletes for every element in the array - * * @param oldMenu The old menu list */ static List<MenuCellState> buildAllDeleteStatusesForMenu(List<MenuCell> oldMenu) { @@ -123,7 +122,6 @@ class DynamicMenuUpdateAlgorithm { /** * Builds a 1-1 list of Adds for every element in the list - * * @param newMenu The new menu list */ static List<MenuCellState> buildAllAddStatusesForMenu(List<MenuCell> newMenu) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java index f854aba82..5b8e98ef8 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java @@ -133,13 +133,13 @@ public class MenuCell implements Cloneable { /** * Creates a new MenuCell Object with multiple parameters and optional fields set * - * @param title The cell's primary text - * @param secondaryText The cell's secondary text - * @param tertiaryText The cell's tertiary text - * @param icon The cell's image - * @param secondaryArtwork The cell's secondary image - * @param voiceCommands Voice commands that will activate the menu cell - * @param listener Calls the code that will be run when the menu cell is selected + * @param title The cell's primary text + * @param secondaryText The cell's secondary text + * @param tertiaryText The cell's tertiary text + * @param icon The cell's image + * @param secondaryArtwork The cell's secondary image + * @param voiceCommands Voice commands that will activate the menu cell + * @param listener Calls the code that will be run when the menu cell is selected */ public MenuCell(@NonNull String title, @Nullable String secondaryText, @Nullable String tertiaryText, @Nullable SdlArtwork icon, @Nullable SdlArtwork secondaryArtwork, @Nullable List<String> voiceCommands, @Nullable MenuSelectionListener listener) { setTitle(title); // title is the only required param @@ -181,14 +181,14 @@ public class MenuCell implements Cloneable { * Creates a new MenuCell Object with multiple parameters and optional fields set * <strong>NOTE: because this has sub-cells, there does not need to be a listener</strong> * - * @param title The cell's primary text - * @param secondaryText The cell's secondary text - * @param tertiaryText The cell's tertiary text - * @param subMenuLayout The submenu's layout that the subCells will be shown in. If `null`, the - * default submenu layout in the screen manager's `MenuConfiguration` will be used. - * @param icon The cell's image - * @param secondaryArtwork The cell's secondary image - * @param subCells The sub-cells for the sub menu that will appear when the cell is selected + * @param title The cell's primary text + * @param secondaryText The cell's secondary text + * @param tertiaryText The cell's tertiary text + * @param subMenuLayout The submenu's layout that the subCells will be shown in. If `null`, the + * default submenu layout in the screen manager's `MenuConfiguration` will be used. + * @param icon The cell's image + * @param secondaryArtwork The cell's secondary image + * @param subCells The sub-cells for the sub menu that will appear when the cell is selected */ public MenuCell(@NonNull String title, @Nullable String secondaryText, @Nullable String tertiaryText, @Nullable MenuLayout subMenuLayout, @Nullable SdlArtwork icon, @Nullable SdlArtwork secondaryArtwork, @Nullable List<MenuCell> subCells) { setTitle(title); // title is the only required param diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java index 29399a219..9ae1ae28d 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuConfiguration.java @@ -104,7 +104,6 @@ public class MenuConfiguration { /** * Note: You should compare using the {@link #equals(Object)} method. <br> * Hash the parameters of the object and return the result for comparison - * * @return the hash code as an int */ @Override diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java index 6bec48097..2e9711dda 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java @@ -173,7 +173,7 @@ class MenuReplaceUtilities { return cell.isSubMenuCell() ? hasImageFieldOfName(windowCapability, ImageFieldName.menuSubMenuSecondaryImage) : hasImageFieldOfName(windowCapability, ImageFieldName.menuCommandSecondaryImage); } - // If there is an icon and the icon has been uploaded, or if the icon is a static icon, it should include the image + // If there is an icon and the icon has been uploaded, or if the icon is a static icon, it should include the image static boolean shouldCellIncludePrimaryImageFromCell(ISdl internalInterface, MenuCell cell, FileManager fileManager, WindowCapability windowCapability) { boolean supportsImage = windowCapabilitySupportsPrimaryImage(internalInterface, windowCapability, cell); return cell.getIcon() != null && supportsImage && (fileManager.hasUploadedFile(cell.getIcon()) || cell.getIcon().isStaticIcon()); diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java index b5f4f3b3c..1339df1eb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/SendingRPCsCompletionListener.java @@ -42,6 +42,5 @@ import java.util.Map; */ interface SendingRPCsCompletionListener { void onComplete(boolean success, Map<RPCRequest, String> errors); - void onResponse(RPCRequest request, RPCResponse response); } |