diff options
Diffstat (limited to 'base/src/main/java')
24 files changed, 229 insertions, 122 deletions
diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java index 135c0cc9e..09e959b90 100644 --- a/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java +++ b/base/src/main/java/com/smartdevicelink/SdlConnection/BaseSdlSession.java @@ -32,8 +32,6 @@ package com.smartdevicelink.SdlConnection; -import androidx.annotation.RestrictTo; - import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.managers.lifecycle.RpcConverter; import com.smartdevicelink.protocol.ISdlProtocol; @@ -58,7 +56,6 @@ import java.util.List; import java.util.ListIterator; import java.util.concurrent.CopyOnWriteArrayList; -@RestrictTo(RestrictTo.Scope.LIBRARY) public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializedListener { private static final String TAG = "SdlSession"; diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java index f5f875467..74aebda5a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/BaseSubManager.java @@ -31,9 +31,7 @@ */ package com.smartdevicelink.managers; -import androidx.annotation.CallSuper; import androidx.annotation.NonNull; -import androidx.annotation.RestrictTo; import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.transport.utl.TransportRecord; @@ -49,7 +47,6 @@ import java.util.List; * * 1. <br> */ -@RestrictTo(RestrictTo.Scope.LIBRARY) public abstract class BaseSubManager { // states - if this gets more complicated we can move elsewhere @@ -68,7 +65,6 @@ public abstract class BaseSubManager { * Starts up a BaseSubManager, and calls provided callback once BaseSubManager is done setting up or failed setup. * @param listener CompletionListener that is called once the BaseSubManager's state is READY, LIMITED, or ERROR */ - @CallSuper public void start(CompletionListener listener){ this.completionListener = listener; int state = getState(); @@ -81,7 +77,6 @@ public abstract class BaseSubManager { /** * <p>Called when manager is being torn down</p> */ - @CallSuper public void dispose(){ transitionToState(SHUTDOWN); } diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java index e1a5414a1..87cb05eb4 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java @@ -34,7 +34,6 @@ package com.smartdevicelink.managers.file; import androidx.annotation.NonNull; -import androidx.annotation.RestrictTo; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; @@ -102,7 +101,6 @@ abstract class BaseFileManager extends BaseSubManager { } @Override - @RestrictTo(RestrictTo.Scope.LIBRARY) public void start(CompletionListener listener) { // prepare manager - don't set state to ready until we have list of files retrieveRemoteFiles(); @@ -301,7 +299,7 @@ abstract class BaseFileManager extends BaseSubManager { } } }; - internalInterface.sendRPCs(requests, onMultipleRequestListener); + internalInterface.sendRequests(requests, onMultipleRequestListener); } /** 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 c8566dbad..d780ef244 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -50,8 +50,10 @@ import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCNotification; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.RPCResponse; +import com.smartdevicelink.proxy.interfaces.IAudioStreamListener; import com.smartdevicelink.proxy.interfaces.ISdl; import com.smartdevicelink.proxy.interfaces.ISdlServiceListener; +import com.smartdevicelink.proxy.interfaces.IVideoStreamListener; import com.smartdevicelink.proxy.rpc.GenericResponse; import com.smartdevicelink.proxy.rpc.OnAppInterfaceUnregistered; import com.smartdevicelink.proxy.rpc.OnButtonEvent; @@ -76,12 +78,15 @@ import com.smartdevicelink.proxy.rpc.enums.Language; import com.smartdevicelink.proxy.rpc.enums.RequestType; import com.smartdevicelink.proxy.rpc.enums.Result; import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason; +import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType; import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCRequestListener; import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener; import com.smartdevicelink.security.SdlSecurityBase; +import com.smartdevicelink.streaming.audio.AudioStreamingCodec; +import com.smartdevicelink.streaming.audio.AudioStreamingParams; import com.smartdevicelink.streaming.video.VideoStreamingParameters; import com.smartdevicelink.transport.BaseTransportConfig; import com.smartdevicelink.util.CorrelationIdGenerator; @@ -942,11 +947,33 @@ abstract class BaseLifecycleManager { } @Override + public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters) { + DebugTool.logWarning(TAG, "startVideoStream is not currently implemented"); + return null; + } + + @Override + public void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params) { + DebugTool.logWarning(TAG, "startAudioService is not currently implemented"); + } + + @Override public void startAudioService(boolean encrypted) { BaseLifecycleManager.this.startAudioService(encrypted); } @Override + public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec, AudioStreamingParams params) { + DebugTool.logWarning(TAG, "startAudioStream is not currently implemented"); + return null; + } + + @Override + public void sendRPCRequest(RPCRequest message) { + BaseLifecycleManager.this.sendRPCMessagePrivate(message, false); + } + + @Override public void sendRPC(RPCMessage message) { if (isConnected()) { BaseLifecycleManager.this.sendRPCMessagePrivate(message, false); @@ -954,6 +981,11 @@ abstract class BaseLifecycleManager { } @Override + public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) { + BaseLifecycleManager.this.sendRPCs(rpcs, listener); + } + + @Override public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) { BaseLifecycleManager.this.sendRPCs(rpcs, listener); } @@ -994,11 +1026,61 @@ abstract class BaseLifecycleManager { } @Override + public Object getCapability(SystemCapabilityType systemCapabilityType) { + if (BaseLifecycleManager.this.systemCapabilityManager != null) { + return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, null, false); + } else { + return null; + } + } + + @Override + public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) { + if (BaseLifecycleManager.this.systemCapabilityManager != null) { + BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, false); + } + } + + @Override + public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) { + if (BaseLifecycleManager.this.systemCapabilityManager != null) { + return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, forceUpdate); + } else { + return null; + } + } + + @Override public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() { return raiResponse; } @Override + public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType) { + if (BaseLifecycleManager.this.systemCapabilityManager != null) { + return BaseLifecycleManager.this.systemCapabilityManager.isCapabilitySupported(systemCapabilityType); + } else { + return false; + } + } + + @Override + public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { + if (BaseLifecycleManager.this.systemCapabilityManager != null) { + BaseLifecycleManager.this.systemCapabilityManager.addOnSystemCapabilityListener(systemCapabilityType, listener); + } + } + + @Override + public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { + if (BaseLifecycleManager.this.systemCapabilityManager != null) { + return BaseLifecycleManager.this.systemCapabilityManager.removeOnSystemCapabilityListener(systemCapabilityType, listener); + } else { + return false; + } + } + + @Override public boolean isTransportForServiceAvailable(SessionType serviceType) { return BaseLifecycleManager.this.session.isTransportForServiceAvailable(serviceType); } @@ -1024,11 +1106,6 @@ abstract class BaseLifecycleManager { public Taskmaster getTaskmaster() { return BaseLifecycleManager.this.getTaskmaster(); } - - @Override - public SystemCapabilityManager getSystemCapabilityManager() { - return BaseLifecycleManager.this.systemCapabilityManager; - } }; /* ******************************************************************************************************* diff --git a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java index 276683ef9..669a34a7a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/permission/BasePermissionManager.java @@ -33,7 +33,6 @@ package com.smartdevicelink.managers.permission; import androidx.annotation.IntDef; import androidx.annotation.NonNull; -import androidx.annotation.RestrictTo; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; @@ -147,7 +146,6 @@ abstract class BasePermissionManager extends BaseSubManager{ } @Override - @RestrictTo(RestrictTo.Scope.LIBRARY) public void start(CompletionListener listener) { checkState(); super.start(listener); @@ -291,7 +289,6 @@ abstract class BasePermissionManager extends BaseSubManager{ * Clean up everything after the manager is no longer needed */ @Override - @RestrictTo(RestrictTo.Scope.LIBRARY) public void dispose(){ super.dispose(); 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 e13855d1c..6d05b93eb 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseScreenManager.java @@ -33,7 +33,6 @@ package com.smartdevicelink.managers.screen; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.annotation.RestrictTo; import com.smartdevicelink.managers.BaseSubManager; import com.smartdevicelink.managers.CompletionListener; @@ -114,7 +113,6 @@ abstract class BaseScreenManager extends BaseSubManager { } @Override - @RestrictTo(RestrictTo.Scope.LIBRARY) public void start(CompletionListener listener) { super.start(listener); this.softButtonManager.start(subManagerListener); @@ -140,7 +138,6 @@ abstract class BaseScreenManager extends BaseSubManager { * <p>Called when manager is being torn down</p> */ @Override - @RestrictTo(RestrictTo.Scope.LIBRARY) public void dispose() { softButtonManager.dispose(); textAndGraphicManager.dispose(); 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 6694e0de3..81df9f9f7 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java @@ -161,9 +161,7 @@ abstract class BaseSoftButtonManager extends BaseSubManager { updateTransactionQueueSuspended(); } }; - if (internalInterface.getSystemCapabilityManager() != null) { - this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); - } + this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); // Add OnButtonPressListener to notify SoftButtonObjects when there is a button press this.onButtonPressListener = new OnRPCNotificationListener() { @@ -234,9 +232,7 @@ abstract class BaseSoftButtonManager extends BaseSubManager { internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, onHMIStatusListener); internalInterface.removeOnRPCNotificationListener(FunctionID.ON_BUTTON_PRESS, onButtonPressListener); internalInterface.removeOnRPCNotificationListener(FunctionID.ON_BUTTON_EVENT, onButtonEventListener); - if (internalInterface.getSystemCapabilityManager() != null) { - internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); - } + internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); } private Queue newTransactionQueue() { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java index 4bdfcb441..9c756e758 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java @@ -140,9 +140,7 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager { // remove listeners internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener); - if (internalInterface.getSystemCapabilityManager() != null) { - internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); - } + internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); super.dispose(); } @@ -504,8 +502,6 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager { updateTransactionQueueSuspended(); } }; - if (internalInterface.getSystemCapabilityManager() != null) { - this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); - } + this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); } } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java index 0e91747a8..0abb94e0a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java @@ -149,9 +149,7 @@ abstract class BaseChoiceSetManager extends BaseSubManager { // remove listeners internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener); - if (internalInterface.getSystemCapabilityManager() != null) { - internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); - } + internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); super.dispose(); } @@ -539,10 +537,8 @@ abstract class BaseChoiceSetManager extends BaseSubManager { defaultMainWindowCapability = null; } }; - if (internalInterface.getSystemCapabilityManager() != null) { - this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); - } - + this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener); + // HMI UPDATES hmiListener = new OnRPCNotificationListener() { @Override diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java index 290a1f05f..8672b1b83 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java @@ -74,7 +74,7 @@ class DeleteChoicesOperation extends Task { if (deleteChoices.size() > 0) { if (internalInterface.get() != null) { - internalInterface.get().sendRPCs(deleteChoices, new OnMultipleRequestListener() { + internalInterface.get().sendRequests(deleteChoices, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { } diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java index 21bf2d712..d8a921b8a 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java @@ -154,7 +154,7 @@ class PreloadChoicesOperation extends Task { } if (internalInterface.get() != null){ - internalInterface.get().sendRPCs(choiceRPCs, new OnMultipleRequestListener() { + internalInterface.get().sendRequests(choiceRPCs, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java index 053f90c8c..c4c18ee16 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java @@ -151,9 +151,7 @@ abstract class BaseMenuManager extends BaseSubManager { // remove listeners internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener); internalInterface.removeOnRPCNotificationListener(FunctionID.ON_COMMAND, commandListener); - if (internalInterface.getSystemCapabilityManager() != null) { - internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); - } + internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); super.dispose(); } @@ -1022,9 +1020,7 @@ abstract class BaseMenuManager extends BaseSubManager { defaultMainWindowCapability = null; } }; - if (internalInterface.getSystemCapabilityManager() != null) { - this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); - } + this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener); // HMI UPDATES hmiListener = new OnRPCNotificationListener() { @@ -1303,7 +1299,7 @@ abstract class BaseMenuManager extends BaseSubManager { return; } - internalInterface.sendRPCs(deleteCommands, new OnMultipleRequestListener() { + internalInterface.sendRequests(deleteCommands, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java index b6ec94930..f96452bb2 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java @@ -190,7 +190,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager { List<DeleteCommand> deleteVoiceCommands = deleteCommandsForVoiceCommands(oldVoiceCommands); oldVoiceCommands.clear(); - internalInterface.sendRPCs(deleteVoiceCommands, new OnMultipleRequestListener() { + internalInterface.sendRequests(deleteVoiceCommands, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { @@ -223,7 +223,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager { inProgressUpdate = addCommandsForVoiceCommands(voiceCommands); - internalInterface.sendRPCs(inProgressUpdate, new OnMultipleRequestListener() { + internalInterface.sendRequests(inProgressUpdate, new OnMultipleRequestListener() { @Override public void onUpdate(int remainingRequests) { diff --git a/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java b/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java index 0f13e6fd9..8f74fbdaa 100644 --- a/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java +++ b/base/src/main/java/com/smartdevicelink/marshal/JsonRPCMarshaller.java @@ -31,8 +31,6 @@ */
package com.smartdevicelink.marshal;
-import androidx.annotation.RestrictTo;
-
import com.smartdevicelink.proxy.RPCMessage;
import com.smartdevicelink.proxy.RPCStruct;
import com.smartdevicelink.trace.SdlTrace;
@@ -52,7 +50,7 @@ import java.util.List; * Responsible for marshalling and unmarshing between RPC Objects and byte streams that are sent
* over transmission
*/
-@RestrictTo(RestrictTo.Scope.LIBRARY)
+
public class JsonRPCMarshaller {
private static final String TAG = "JsonRPCMarshaller";
private static final String SDL_LIB_PRIVATE_KEY = "42baba60-eb57-11df-98cf-0800200c9a66";
diff --git a/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java b/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java index eaabf27d7..ebf0353bc 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java +++ b/base/src/main/java/com/smartdevicelink/protocol/BinaryFrameHeader.java @@ -32,11 +32,9 @@ package com.smartdevicelink.protocol;
-import androidx.annotation.RestrictTo;
-
import com.smartdevicelink.util.BitConverter;
import com.smartdevicelink.util.DebugTool;
-@RestrictTo(RestrictTo.Scope.LIBRARY)
+
public class BinaryFrameHeader {
private static final String TAG = "BinaryFrameHeader";
diff --git a/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java b/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java index 6f65b55bd..23ceafbdb 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java +++ b/base/src/main/java/com/smartdevicelink/protocol/ISecondaryTransportListener.java @@ -31,11 +31,8 @@ */ package com.smartdevicelink.protocol; -import androidx.annotation.RestrictTo; - import com.smartdevicelink.transport.utl.TransportRecord; -@RestrictTo(RestrictTo.Scope.LIBRARY) public interface ISecondaryTransportListener { void onConnectionSuccess(TransportRecord transportRecord); void onConnectionFailure(); diff --git a/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java b/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java index 33967b57f..d5e14d940 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java +++ b/base/src/main/java/com/smartdevicelink/protocol/ProtocolMessage.java @@ -1,42 +1,39 @@ -/*
- * 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.protocol;
-import androidx.annotation.RestrictTo;
-
import com.smartdevicelink.protocol.enums.MessageType;
import com.smartdevicelink.protocol.enums.SessionType;
-@RestrictTo(RestrictTo.Scope.LIBRARY)
public class ProtocolMessage {
private byte version = 1;
private SessionType _sessionType = SessionType.RPC;
diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java b/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java index 33ffad27f..306d94c2c 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java +++ b/base/src/main/java/com/smartdevicelink/protocol/SdlPacketFactory.java @@ -31,14 +31,11 @@ */ package com.smartdevicelink.protocol; -import androidx.annotation.RestrictTo; - import com.smartdevicelink.protocol.enums.ControlFrameTags; import com.smartdevicelink.protocol.enums.FrameDataControlFrameType; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.util.BitConverter; -@RestrictTo(RestrictTo.Scope.LIBRARY) public class SdlPacketFactory { /* diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java index 2bab789e0..702bb5a2f 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java +++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java @@ -32,7 +32,6 @@ package com.smartdevicelink.protocol; import androidx.annotation.NonNull; -import androidx.annotation.RestrictTo; import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.exception.SdlExceptionCause; @@ -65,7 +64,6 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; -@RestrictTo(RestrictTo.Scope.LIBRARY) public class SdlProtocolBase { private static final String TAG ="SdlProtocol"; private final static String FailurePropagating_Msg = "Failure propagating "; diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java index d8a70b062..0c46e3743 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java +++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java @@ -4,7 +4,6 @@ import androidx.annotation.NonNull; import com.livio.taskmaster.Taskmaster; import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener; -import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager; import com.smartdevicelink.protocol.enums.FunctionID; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; @@ -95,18 +94,58 @@ public interface ISdl { void startVideoService(VideoStreamingParameters parameters, boolean encrypted); /** + * Starts the video streaming service + * @param isEncrypted flag to start this service with encryption or not + * @param parameters desired video streaming params for this sevice to be started with + */ + @Deprecated + IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters); + + /** + * Starts the Audio streaming service + * @param encrypted flag to start this service with encryption or not + */ + @Deprecated + void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params); + + /** * Starts the Audio streaming service * @param encrypted flag to start this service with encryption or not */ void startAudioService(boolean encrypted); /** + * Start Audio Stream and return IAudioStreamListener + * @param isEncrypted whether or not the audio stream should be encrypted + * @param codec the codec that should be used for the audio stream + * @param params specific options and settings associated with the audio stream + * @return IAudioStreamListener, an interface that allows the writing of audio data + */ + @Deprecated + IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec, AudioStreamingParams params); + + /** + * Pass an RPC message through the proxy to be sent to the connected module + * @param message RPCRequest that should be sent to the module + */ + @Deprecated + void sendRPCRequest(RPCRequest message); + + /** * Pass an RPC message through the proxy to be sent to the connected module * @param message RPCMessage that should be sent to the module */ void sendRPC(RPCMessage message); /** + * Pass a list of RPC requests through the proxy to be sent to core + * @param rpcs List of RPC requests + * @param listener OnMultipleRequestListener that is called between requests and after all are processed + */ + @Deprecated + void sendRequests(List<? extends RPCRequest> rpcs, final OnMultipleRequestListener listener); + + /** * Pass a list of RPC messages through the proxy to be sent to core * @param rpcs List of RPC messages * @param listener OnMultipleRequestListener that is called between requests and after all are processed @@ -169,12 +208,65 @@ public interface ISdl { boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener); /** + * Get SystemCapability Object + * @param systemCapabilityType a system capability type that should be retrieved + * @return the system capability provided if available, null if not + * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead. + */ + @Deprecated + Object getCapability(SystemCapabilityType systemCapabilityType); + + /** + * Get Capability + * @param systemCapabilityType a system capability type that should be retrieved + * @param scListener listener that will be called when the system capability is retrieved. If already cached, it + * will be called immediately + * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead. + */ + @Deprecated + void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener); + + /** Gets the capability object that corresponds to the supplied capability type by returning the currently cached value immediately (or null) as well as calling the listener immediately with the cached value, if available. If not available, the listener will retrieve a new value and return that when the head unit responds. + * <strong>If capability is not cached, the method will return null and trigger the supplied listener when the capability becomes available</strong> + * @param systemCapabilityType type of capability desired + * @param scListener callback to execute upon retrieving capability + * @param forceUpdate flag to force getting a new fresh copy of the capability from the head unit even if it is cached + * @return desired capability if it is cached in the manager, otherwise returns a null object + */ + @Deprecated + Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate); + + /** * Get RegisterAppInterfaceResponse * @return the RegisterAppInterfaceResponse if available, null if not */ RegisterAppInterfaceResponse getRegisterAppInterfaceResponse(); /** + * Check if capability is supported + * @param systemCapabilityType a system capability type that should be checked for support + * @return Boolean whether or not the supplied capability type is supported on the connected module + */ + @Deprecated + boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType); + + /** + * Add a listener to be called whenever a new capability is retrieved + * @param systemCapabilityType Type of capability desired + * @param listener callback to execute upon retrieving capability + */ + @Deprecated + void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener); + + /** + * Remove an OnSystemCapabilityListener that was previously added + * @param systemCapabilityType Type of capability + * @param listener the listener that should be removed + */ + @Deprecated + boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener); + + /** * Check to see if a transport is available to start/use the supplied service. * @param serviceType the session that should be checked for transport availability * @return true if there is either a supported @@ -204,6 +296,4 @@ public interface ISdl { void startRPCEncryption(); Taskmaster getTaskmaster(); - - SystemCapabilityManager getSystemCapabilityManager(); } diff --git a/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java b/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java index 998888bc5..e759268ec 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java +++ b/base/src/main/java/com/smartdevicelink/streaming/IStreamListener.java @@ -29,13 +29,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.streaming; - -import androidx.annotation.RestrictTo; - -import com.smartdevicelink.protocol.ProtocolMessage; - -@RestrictTo(RestrictTo.Scope.LIBRARY) -public interface IStreamListener { - void sendStreamPacket(ProtocolMessage pm); +package com.smartdevicelink.streaming;
+
+import com.smartdevicelink.protocol.ProtocolMessage;
+
+public interface IStreamListener {
+ void sendStreamPacket(ProtocolMessage pm);
}
\ No newline at end of file diff --git a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java index c1e6ec0ce..fe0f7a981 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java +++ b/base/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java @@ -30,13 +30,9 @@ package com.smartdevicelink.streaming.audio; -import androidx.annotation.RestrictTo; - /** * A struct to hold audio format information that are common to codecs. */ - -@RestrictTo(RestrictTo.Scope.LIBRARY) public class AudioStreamingParams { /** * Sampling rate in Hz, e.g. 44100 diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java index 549bcfd13..9236be7a9 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java @@ -30,8 +30,6 @@ package com.smartdevicelink.streaming.video; -import androidx.annotation.RestrictTo; - import com.smartdevicelink.SdlConnection.SdlSession; import com.smartdevicelink.protocol.ProtocolMessage; import com.smartdevicelink.protocol.enums.SessionType; @@ -62,7 +60,6 @@ import java.util.concurrent.LinkedBlockingQueue; * * @author Sho Amano */ -@RestrictTo(RestrictTo.Scope.LIBRARY) public class RTPH264Packetizer extends AbstractPacketizer implements IVideoStreamListener, Runnable { // Approximate size of data that mOutputQueue can hold in bytes. diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java index c9bea1fb9..372e2548c 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java @@ -32,8 +32,6 @@ package com.smartdevicelink.streaming.video; -import androidx.annotation.RestrictTo; - import com.smartdevicelink.proxy.rpc.ImageResolution; import com.smartdevicelink.proxy.rpc.VideoStreamingCapability; import com.smartdevicelink.proxy.rpc.VideoStreamingFormat; @@ -44,7 +42,6 @@ import com.smartdevicelink.util.DebugTool; import java.util.List; @SuppressWarnings("FieldCanBeLocal") -@RestrictTo(RestrictTo.Scope.LIBRARY) public class VideoStreamingParameters { private static final String TAG = "VideoStreamingParameters"; private final VideoStreamingProtocol DEFAULT_PROTOCOL = VideoStreamingProtocol.RAW; |