Merge branch 'develop' into feature/rename_sdl_connection

Author: bilal-alsharifi

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/MainActivity.java

@@ -8,8 +8,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
-	private static final String TAG = "MainActivity";
-	
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);

android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlReceiver.java

@@ -9,7 +9,7 @@
 import com.smartdevicelink.util.DebugTool;
 
 public class SdlReceiver  extends SdlBroadcastReceiver {
-	private static final String TAG = "SdlBroadcastReciever";
+	private static final String TAG = "SdlBroadcastReceiver";
 
 	@Override
 	public void onSdlEnabled(Context context, Intent intent) {

android/hello_sdl_android/src/main/res.zip

@@ -87,14 +87,18 @@ private static byte[] getAVCCodecSpecificData(MediaFormat format) {
         }
 
         ByteBuffer sps = format.getByteBuffer("csd-0");
-        int spsLen = sps.remaining();
+        int spsLen = sps != null ? sps.remaining() : 0;
         ByteBuffer pps = format.getByteBuffer("csd-1");
-        int ppsLen = pps.remaining();
+        int ppsLen = pps != null ? pps.remaining() : 0;
 
         byte[] output = new byte[spsLen + ppsLen];
         try {
-            sps.get(output, 0, spsLen);
-            pps.get(output, spsLen, ppsLen);
+            if (sps != null) {
+                sps.get(output, 0, spsLen);
+            }
+            if (pps != null) {
+                pps.get(output, spsLen, ppsLen);
+            }
         } catch (Exception e) {
             // should not happen
             DebugTool.logWarning(TAG, "Error while copying H264 codec specific data: " + e);

android/hello_sdl_android/src/main/res/values-v11/styles.xml

@@ -214,7 +214,7 @@ public void drainEncoder(boolean endOfStream) {
 
 				if (mBufferInfo.size != 0) {
 					ByteBuffer encoderOutputBuffer = encoderOutputBuffers[encoderStatus];
-					byte[] dataToWrite = null;
+					byte[] dataToWrite;
 					int dataOffset = 0;
 
 					// append SPS and PPS in front of every IDR NAL unit

android/hello_sdl_android/src/main/res/values-v14/styles.xml

@@ -101,17 +101,14 @@ public void init(Context context, IVideoStreamListener outputListener, VideoStre
         initPassed = true;
     }
 
-    @SuppressWarnings("unused")
     public VideoStreamingParameters getStreamingParams(){
         return this.streamingParams;
     }
 
-    @SuppressWarnings("unused")
     public void setStreamingParams(int displayDensity, ImageResolution resolution, int frameRate, int bitrate, int interval, VideoStreamingFormat format) {
         this.streamingParams = new VideoStreamingParameters(displayDensity, frameRate, bitrate, interval, resolution, format);
     }
 
-    @SuppressWarnings("unused")
     public void setStreamingParams(VideoStreamingParameters streamingParams) {
         this.streamingParams = streamingParams;
     }
@@ -321,7 +318,6 @@ public void run() {
             }
         }
 
-        @SuppressWarnings("deprecation")
         void drainEncoder(boolean endOfStream) {
             if (mVideoEncoder == null || mOutputListener == null) {
                 return;

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

@@ -91,7 +91,7 @@ public void start() {
                     @Override
                     public void onTransportEvent(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail) {
 
-                        //Pass to submanagers that need it
+                        //Pass to sub managers that need it
                         if (videoStreamManager != null) {
                             videoStreamManager.handleTransportUpdated(connectedTransports, audioStreamTransportAvail, videoStreamTransportAvail);
                         }

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

@@ -91,7 +91,7 @@ public void start() {
      * Runnable to decode audio data
      */
     private static class DecoderRunnable implements Runnable {
-        WeakReference<AudioDecoderCompat> weakReference;
+        final WeakReference<AudioDecoderCompat> weakReference;
 
         /**
          * Decodes all audio data from source