Static analysis warnings resolved in ImsMediaService

- EmptyBlockTag, InvalidParam
  UnusedVariable, JdkObsolete
  CatchAndPrintStackTrace, FragmentInjection warnings resolved

Bug: 260189797
Test: errorprone report generated and check for resolved warnings
      Verified VoLTE calls with device
Change-Id: I681f4580ba6d0989bf28563eff2d09d12eaae26b

9 files changed, 20 insertions, 18 deletions

diff --git a/service/src/com/android/telephony/imsmedia/AudioListener.java b/service/src/com/android/telephony/imsmedia/AudioListener.java
index 81973c72..4f11e65b 100644
--- a/service/src/com/android/telephony/imsmedia/AudioListener.java
+++ b/service/src/com/android/telephony/imsmedia/AudioListener.java
@@ -49,7 +49,7 @@ public class AudioListener implements JNIImsMediaListener {
     /**
      * Sets native object to identify the instance of @BaseManager
      *
-     * @param object
+     * @param object the native instance of AudioManager
      */
     public void setNativeObject(final long object) {
         mNativeObject = object;
diff --git a/service/src/com/android/telephony/imsmedia/AudioService.java b/service/src/com/android/telephony/imsmedia/AudioService.java
index 6f913c1c..a6590c16 100644
--- a/service/src/com/android/telephony/imsmedia/AudioService.java
+++ b/service/src/com/android/telephony/imsmedia/AudioService.java
@@ -98,7 +98,7 @@ public class AudioService {
      * associated with the session. This will also close the session object
      * and associated callback.
      *
-     * @param session RTP session to be closed.
+     * @param sessionId RTP session to be closed.
      */
     public void closeSession(final int sessionId) {
         Log.d(LOG_TAG, "closeSession");
diff --git a/service/src/com/android/telephony/imsmedia/AudioSession.java b/service/src/com/android/telephony/imsmedia/AudioSession.java
index 2fc668e9..0a06e4d3 100644
--- a/service/src/com/android/telephony/imsmedia/AudioSession.java
+++ b/service/src/com/android/telephony/imsmedia/AudioSession.java
@@ -35,7 +35,6 @@ import androidx.annotation.Nullable;
 
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -412,9 +411,8 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         if (isAudioOffload()) {
             try {
                 List<android.hardware.radio.ims.media.RtpHeaderExtension>
-                        halExtensions = new ArrayList<>();
-                halExtensions = extensions.stream().map(Utils::convertRtpHeaderExtension)
-                        .collect(Collectors.toList());
+                        halExtensions = extensions.stream().map(Utils::convertRtpHeaderExtension)
+                                .collect(Collectors.toList());
                 mHalSession.sendHeaderExtension(halExtensions);
             } catch (RemoteException e) {
                 Log.e(TAG, "sendHeaderExtension : " + e);
diff --git a/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java b/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java
index ca88b021..1d1f49b8 100644
--- a/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java
+++ b/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java
@@ -18,13 +18,12 @@ package com.android.telephony.imsmedia;
 
 import android.content.res.AssetManager;
 import android.os.Parcel;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.view.Surface;
 
 import androidx.annotation.VisibleForTesting;
 
-import java.util.Hashtable;
-
 /** JNI interface class to send message to libimsmediajni */
 public class JNIImsMediaService {
     private static final String TAG = "JNIImsMediaService";
@@ -32,14 +31,14 @@ public class JNIImsMediaService {
     private final Object mLock = new Object();
 
     /** for media service based on type ex. audio, video, rtt */
-    private static Hashtable<Integer, JNIImsMediaListener> sListeners =
-            new Hashtable<Integer, JNIImsMediaListener>();
+    private static ArrayMap<Integer, JNIImsMediaListener> sListeners =
+            new ArrayMap<Integer, JNIImsMediaListener>();
 
     /**
      * Gets instance object of BaseManager with the corresponding media type
      *
      * @param mediatype Audio/Video/Text type
-     * @return
+     * @return the native instance of BaseManager
      */
     public static native long getInterface(int mediatype);
 
diff --git a/service/src/com/android/telephony/imsmedia/TextListener.java b/service/src/com/android/telephony/imsmedia/TextListener.java
index f7018962..2c7d620c 100644
--- a/service/src/com/android/telephony/imsmedia/TextListener.java
+++ b/service/src/com/android/telephony/imsmedia/TextListener.java
@@ -48,7 +48,7 @@ public class TextListener implements JNIImsMediaListener {
     /**
      * Sets native object to identify the instance of @BaseManager
      *
-     * @param object
+     * @param object the native instance of TextManager
      */
     public void setNativeObject(final long object) {
         mNativeObject = object;
diff --git a/service/src/com/android/telephony/imsmedia/TextSession.java b/service/src/com/android/telephony/imsmedia/TextSession.java
index 15d600b1..b0895d8e 100644
--- a/service/src/com/android/telephony/imsmedia/TextSession.java
+++ b/service/src/com/android/telephony/imsmedia/TextSession.java
@@ -16,7 +16,6 @@
 
 package com.android.telephony.imsmedia;
 
-import android.hardware.radio.ims.media.IImsMediaSession;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -54,7 +53,6 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
 
     private int mSessionId;
     private IImsTextSessionCallback mCallback;
-    private IImsMediaSession mHalSession;
     private TextSessionHandler mHandler;
     private TextService mTextService;
     private TextListener mTextListener;
diff --git a/service/src/com/android/telephony/imsmedia/VideoListener.java b/service/src/com/android/telephony/imsmedia/VideoListener.java
index 4c8a7f8d..ce70114b 100644
--- a/service/src/com/android/telephony/imsmedia/VideoListener.java
+++ b/service/src/com/android/telephony/imsmedia/VideoListener.java
@@ -48,7 +48,7 @@ public class VideoListener implements JNIImsMediaListener {
     /**
      * Sets native object to identify the instance of @BaseManager
      *
-     * @param object
+     * @param object the native instance of VideoManager
      */
     public void setNativeObject(final long object) {
         mNativeObject = object;
diff --git a/service/src/com/android/telephony/imsmedia/VideoSession.java b/service/src/com/android/telephony/imsmedia/VideoSession.java
index 4450e215..a2351df9 100644
--- a/service/src/com/android/telephony/imsmedia/VideoSession.java
+++ b/service/src/com/android/telephony/imsmedia/VideoSession.java
@@ -16,7 +16,6 @@
 
 package com.android.telephony.imsmedia;
 
-import android.hardware.radio.ims.media.IImsMediaSession;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -66,7 +65,6 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
 
     private int mSessionId;
     private IImsVideoSessionCallback mCallback;
-    private IImsMediaSession mHalSession;
     private VideoSessionHandler mHandler;
     private VideoService mVideoService;
     private VideoListener mVideoListener;
diff --git a/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java b/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java
index 048d39a9..17518c10 100644
--- a/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java
+++ b/service/src/com/android/telephony/imsmedia/config/ConfigPreference.java
@@ -120,6 +120,15 @@ public class ConfigPreference extends PreferenceActivity {
         initPreferences();
     }
 
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        if (ConfigListItemChangeListener.class.getName().equals(fragmentName)
+                || CheckBoxItemChangeListener.class.getName().equals(fragmentName)) {
+            return true;
+        }
+        return false;
+    }
+
     private void initPreferences() {
         Log.d(LOG_TAG, "initPreferences");
         for (int i = 0; i < KEY_LIST_PREFERENCES.length; ++i) {
@@ -201,7 +210,7 @@ public class ConfigPreference extends PreferenceActivity {
         try {
             intValue = Integer.parseInt(value);
         } catch (NumberFormatException e) {
-            e.printStackTrace();
+            Log.e(LOG_TAG, "NumberFormatException: " + e.toString());
         }
         return intValue;
     }