Change Rlog to Log in ImsMedia(Refactoring)

Bug: 242004219
Test: test with device
Change-Id: I9a75b19f51e3c2545e951db576d99589af49c97c

15 files changed, 150 insertions, 151 deletions

diff --git a/service/src/com/android/telephony/imsmedia/AudioListener.java b/service/src/com/android/telephony/imsmedia/AudioListener.java
index 8f28e621..bfb9c4c6 100644
--- a/service/src/com/android/telephony/imsmedia/AudioListener.java
+++ b/service/src/com/android/telephony/imsmedia/AudioListener.java
@@ -19,8 +19,8 @@ package com.android.telephony.imsmedia;
 import android.os.Handler;
 import android.os.Parcel;
 import android.telephony.CallQuality;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.AudioConfig;
+import android.util.Log;
 
 /**
  * Audio listener to process JNI messages from local AP based RTP stack
@@ -65,17 +65,17 @@ public class AudioListener implements JNIImsMediaListener {
         switch (event) {
             case AudioSession.EVENT_OPEN_SESSION_SUCCESS:
                 final int sessionId = parcel.readInt();
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onOpenSessionSuccess(sessionId,
                     new AudioLocalSession(sessionId, mNativeObject));
                 break;
             case AudioSession.EVENT_OPEN_SESSION_FAILURE:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onOpenSessionFailure(parcel.readInt(),
                     parcel.readInt());
                 break;
             case AudioSession.EVENT_SESSION_CLOSED:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onSessionClosed(parcel.readInt());
                 break;
             case AudioSession.EVENT_MODIFY_SESSION_RESPONSE:
@@ -83,7 +83,7 @@ public class AudioListener implements JNIImsMediaListener {
             case AudioSession.EVENT_CONFIRM_CONFIG_RESPONSE:
                 final int result = parcel.readInt();
                 final AudioConfig config = AudioConfig.CREATOR.createFromParcel(parcel);
-                Rlog.d(LOG_TAG, "onMessage=" + event + ", result=" + result);
+                Log.d(LOG_TAG, "onMessage=" + event + ", result=" + result);
                 Utils.sendMessage(mHandler, event, result, Utils.UNUSED, config);
                 break;
             case AudioSession.EVENT_FIRST_MEDIA_PACKET_IND:
@@ -101,16 +101,16 @@ public class AudioListener implements JNIImsMediaListener {
                 break;
             case AudioSession.EVENT_TRIGGER_ANBR_QUERY_IND:
                 final AudioConfig configAnbr = AudioConfig.CREATOR.createFromParcel(parcel);
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 Utils.sendMessage(mHandler, event, configAnbr);
                 break;
             case AudioSession.EVENT_DTMF_RECEIVED_IND:
                 final char dtmfDigit = (char) parcel.readByte();
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 Utils.sendMessage(mHandler, event, dtmfDigit);
                 break;
             case AudioSession.EVENT_CALL_QUALITY_CHANGE_IND:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 Utils.sendMessage(mHandler, event, CallQuality.CREATOR.createFromParcel(parcel));
                 break;
             default:
diff --git a/service/src/com/android/telephony/imsmedia/AudioLocalSession.java b/service/src/com/android/telephony/imsmedia/AudioLocalSession.java
index c2d4b427..fc5f1927 100644
--- a/service/src/com/android/telephony/imsmedia/AudioLocalSession.java
+++ b/service/src/com/android/telephony/imsmedia/AudioLocalSession.java
@@ -17,10 +17,10 @@
 package com.android.telephony.imsmedia;
 
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.ims.RtpHeaderExtension;
 import android.telephony.imsmedia.AudioConfig;
 import android.telephony.imsmedia.MediaQualityThreshold;
+import android.util.Log;
 
 import java.util.List;
 
@@ -44,7 +44,7 @@ public class AudioLocalSession {
 
     /** Returns the unique session identifier */
     public int getSessionId() {
-        Rlog.d(TAG, "getSessionId");
+        Log.d(TAG, "getSessionId");
         return mSessionId;
     }
 
@@ -73,7 +73,7 @@ public class AudioLocalSession {
      * @param config provides remote end point info and codec details
      */
     public void modifySession(final AudioConfig config) {
-        Rlog.d(TAG, "modifySession: " + config);
+        Log.d(TAG, "modifySession: " + config);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_MODIFY_SESSION);
         if (config != null) {
@@ -89,7 +89,7 @@ public class AudioLocalSession {
      * @param config provides remote end point info and codec details
      */
     public void addConfig(final AudioConfig config) {
-        Rlog.d(TAG, "addConfig: " + config);
+        Log.d(TAG, "addConfig: " + config);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_ADD_CONFIG);
         if (config != null) {
@@ -106,7 +106,7 @@ public class AudioLocalSession {
      * @param config remote config to be deleted
      */
     public void deleteConfig(final AudioConfig config) {
-        Rlog.d(TAG, "deleteConfig: " + config);
+        Log.d(TAG, "deleteConfig: " + config);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_DELETE_CONFIG);
         if (config != null) {
@@ -128,7 +128,7 @@ public class AudioLocalSession {
      * @param config remote config to be confirmed
      */
     public void confirmConfig(final AudioConfig config) {
-        Rlog.d(TAG, "confirmConfig: " + config);
+        Log.d(TAG, "confirmConfig: " + config);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_CONFIRM_CONFIG);
         if (config != null) {
@@ -144,7 +144,7 @@ public class AudioLocalSession {
      * @param duration of the key press in milliseconds.
      */
     public void sendDtmf(final char dtmfDigit, final int duration) {
-        Rlog.d(TAG, "sendDtmf: digit= " + dtmfDigit + ", duration=" + duration);
+        Log.d(TAG, "sendDtmf: digit= " + dtmfDigit + ", duration=" + duration);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_SEND_DTMF);
         parcel.writeByte((byte)dtmfDigit);
@@ -158,7 +158,7 @@ public class AudioLocalSession {
      * @param extensions List of RTP header extensions to be transmitted
      */
     public void sendHeaderExtension(final List<RtpHeaderExtension> extensions) {
-        Rlog.d(TAG, "sendHeaderExtension");
+        Log.d(TAG, "sendHeaderExtension");
         // TODO: add implementation
     }
 
@@ -170,7 +170,7 @@ public class AudioLocalSession {
      *        parameters
      */
     public void setMediaQualityThreshold(final MediaQualityThreshold threshold) {
-        Rlog.d(TAG, "setMediaQualityThreshold: " + threshold);
+        Log.d(TAG, "setMediaQualityThreshold: " + threshold);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_SET_MEDIA_QUALITY_THRESHOLD);
         if (threshold != null) {
diff --git a/service/src/com/android/telephony/imsmedia/AudioOffloadService.java b/service/src/com/android/telephony/imsmedia/AudioOffloadService.java
index cf0fbb04..c18f1e3e 100644
--- a/service/src/com/android/telephony/imsmedia/AudioOffloadService.java
+++ b/service/src/com/android/telephony/imsmedia/AudioOffloadService.java
@@ -23,8 +23,8 @@ import android.hardware.radio.ims.media.LocalEndPoint;
 import android.hardware.radio.ims.media.RtpConfig;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.AudioConfig;
+import android.util.Log;
 
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
 
@@ -55,14 +55,14 @@ public class AudioOffloadService {
 
     // Initializes the HAL
     private synchronized void initMediaHal() {
-        Rlog.d(LOG_TAG, "initMediaHal");
+        Log.d(LOG_TAG, "initMediaHal");
 
         try {
             mImsMedia = IImsMedia.Stub.asInterface(ServiceManager.waitForDeclaredService(
                     IImsMedia.DESCRIPTOR + "/default"));
             mImsMedia.setListener(listener);
         } catch (Exception e) {
-            Rlog.e(LOG_TAG, "initMediaHal: Exception: " + e);
+            Log.e(LOG_TAG, "initMediaHal: Exception: " + e);
             return;
         }
     }
@@ -98,7 +98,7 @@ public class AudioOffloadService {
         try {
             getIImsMedia().openSession(sessionId, lep, rtpConfig);
         } catch (RemoteException e) {
-            Rlog.e(LOG_TAG, "openSession: " + e);
+            Log.e(LOG_TAG, "openSession: " + e);
         }
     }
 
@@ -106,7 +106,7 @@ public class AudioOffloadService {
         try {
             getIImsMedia().closeSession(sessionId);
         } catch (RemoteException e) {
-            Rlog.e(LOG_TAG, "closeSession: " + e);
+            Log.e(LOG_TAG, "closeSession: " + e);
         }
     }
 
diff --git a/service/src/com/android/telephony/imsmedia/AudioService.java b/service/src/com/android/telephony/imsmedia/AudioService.java
index e9b4a493..15ed50bc 100644
--- a/service/src/com/android/telephony/imsmedia/AudioService.java
+++ b/service/src/com/android/telephony/imsmedia/AudioService.java
@@ -17,8 +17,8 @@
 package com.android.telephony.imsmedia;
 
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.ImsMediaSession;
+import android.util.Log;
 
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
 
@@ -77,7 +77,7 @@ public class AudioService {
      */
     public void openSession(final int sessionId, final OpenSessionParams sessionParams) {
         if (sessionParams == null) return;
-        Rlog.d(LOG_TAG, "openSession: sessionId = " + sessionId
+        Log.d(LOG_TAG, "openSession: sessionId = " + sessionId
                     + "," + sessionParams.getRtpConfig());
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_OPEN_SESSION);
@@ -99,7 +99,7 @@ public class AudioService {
      * @param session RTP session to be closed.
      */
     public void closeSession(final int sessionId) {
-        Rlog.d(LOG_TAG, "closeSession");
+        Log.d(LOG_TAG, "closeSession");
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(AudioSession.CMD_CLOSE_SESSION);
         sendRequest(sessionId, parcel);
diff --git a/service/src/com/android/telephony/imsmedia/AudioSession.java b/service/src/com/android/telephony/imsmedia/AudioSession.java
index fe28a71d..bb8fc5ce 100644
--- a/service/src/com/android/telephony/imsmedia/AudioSession.java
+++ b/service/src/com/android/telephony/imsmedia/AudioSession.java
@@ -23,12 +23,12 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.VisibleForTesting;
 import android.telephony.CallQuality;
-import android.telephony.Rlog;
 import android.telephony.ims.RtpHeaderExtension;
 import android.telephony.imsmedia.AudioConfig;
 import android.telephony.imsmedia.IImsAudioSession;
 import android.telephony.imsmedia.IImsAudioSessionCallback;
 import android.telephony.imsmedia.MediaQualityThreshold;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -91,11 +91,11 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         mCallback = callback;
         mHandler = new AudioSessionHandler(Looper.getMainLooper());
         if (isAudioOffload()) {
-            Rlog.d(TAG, "Initialize offload service");
+            Log.d(TAG, "Initialize offload service");
             mOffloadService = AudioOffloadService.getInstance();
             mOffloadListener = new AudioOffloadListener(mHandler);
         } else {
-            Rlog.d(TAG, "Initialize local audio service");
+            Log.d(TAG, "Initialize local audio service");
             mAudioService = new AudioService();
             mAudioListener = new AudioListener(mHandler);
             mAudioService.setListener(mAudioListener);
@@ -155,72 +155,72 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
 
     @Override
     public void modifySession(AudioConfig config) {
-        Rlog.d(TAG, "modifySession: " + config);
+        Log.d(TAG, "modifySession: " + config);
         Utils.sendMessage(mHandler, CMD_MODIFY_SESSION, config);
     }
 
     @Override
     public void addConfig(AudioConfig config) {
-        Rlog.d(TAG, "addConfig: " + config);
+        Log.d(TAG, "addConfig: " + config);
         Utils.sendMessage(mHandler, CMD_ADD_CONFIG, config);
     }
 
     @Override
     public void deleteConfig(AudioConfig config) {
-        Rlog.d(TAG, "deleteConfig: " + config);
+        Log.d(TAG, "deleteConfig: " + config);
         Utils.sendMessage(mHandler, CMD_DELETE_CONFIG, config);
     }
 
     @Override
     public void confirmConfig(AudioConfig config) {
-        Rlog.d(TAG, "confirmConfig: " + config);
+        Log.d(TAG, "confirmConfig: " + config);
         Utils.sendMessage(mHandler, CMD_CONFIRM_CONFIG, config);
     }
 
     @Override
     public void sendDtmf(char digit, int duration) {
-        Rlog.d(TAG, "sendDtmf: digit=" + digit + ",duration=" + duration);
+        Log.d(TAG, "sendDtmf: digit=" + digit + ",duration=" + duration);
         Utils.sendMessage(mHandler, CMD_SEND_DTMF, duration, Utils.UNUSED, digit);
     }
 
     @Override
     public void startDtmf(char digit) {
-        Rlog.d(TAG, "startDtmf: digit=" + digit);
+        Log.d(TAG, "startDtmf: digit=" + digit);
         Utils.sendMessage(mHandler, CMD_START_DTMF, digit);
     }
 
     @Override
     public void stopDtmf() {
-        Rlog.d(TAG, "stopDtmf");
+        Log.d(TAG, "stopDtmf");
         Utils.sendMessage(mHandler, CMD_STOP_DTMF);
     }
     @Override
     public void sendHeaderExtension(List<RtpHeaderExtension> extensions) {
-        Rlog.d(TAG, "sendHeaderExtension");
+        Log.d(TAG, "sendHeaderExtension");
         Utils.sendMessage(mHandler, CMD_SEND_RTP_HDR_EXTN, extensions);
     }
 
     @Override
     public void setMediaQualityThreshold(MediaQualityThreshold threshold) {
-        Rlog.d(TAG, "setMediaQualityThreshold: " + threshold);
+        Log.d(TAG, "setMediaQualityThreshold: " + threshold);
         Utils.sendMessage(mHandler, CMD_SET_MEDIA_QUALITY_THRESHOLD, threshold);
     }
 
     @Override
     public void onOpenSessionSuccess(Object session) {
-        Rlog.d(TAG, "onOpenSessionSuccess");
+        Log.d(TAG, "onOpenSessionSuccess");
         Utils.sendMessage(mHandler, EVENT_OPEN_SESSION_SUCCESS, session);
     }
 
     @Override
     public void onOpenSessionFailure(int error) {
-        Rlog.d(TAG, "onOpenSessionFailure: error=" + error);
+        Log.d(TAG, "onOpenSessionFailure: error=" + error);
         Utils.sendMessage(mHandler, EVENT_OPEN_SESSION_FAILURE, error);
     }
 
     @Override
     public void onSessionClosed() {
-        Rlog.d(TAG, "onSessionClosed");
+        Log.d(TAG, "onSessionClosed");
         Utils.sendMessage(mHandler, EVENT_SESSION_CLOSED);
     }
 
@@ -238,7 +238,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
 
         @Override
         public void handleMessage (Message msg) {
-            Rlog.d(TAG, "handleMessage: " + msg.what);
+            Log.d(TAG, "handleMessage: " + msg.what);
             switch(msg.what) {
                 case CMD_OPEN_SESSION:
                     handleOpenSession((OpenSessionParams)msg.obj);
@@ -330,11 +330,11 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
     }
 
     private void handleCloseSession() {
-        Rlog.d(TAG, "handleCloseSession");
+        Log.d(TAG, "handleCloseSession");
         if (isAudioOffload()) {
             mOffloadService.closeSession(mSessionId);
         } else {
-            Rlog.d(TAG, "handleCloseSession else");
+            Log.d(TAG, "handleCloseSession else");
             mAudioService.closeSession(mSessionId);
         }
     }
@@ -344,7 +344,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 mHalSession.modifySession(Utils.convertToRtpConfig(config));
             } catch (RemoteException e) {
-                Rlog.e(TAG, "modifySession : " + e);
+                Log.e(TAG, "modifySession : " + e);
             }
         } else {
             mLocalSession.modifySession(config);
@@ -356,7 +356,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 mHalSession.modifySession(Utils.convertToRtpConfig(config));
             } catch (RemoteException e) {
-                Rlog.e(TAG, "addConfig : " + e);
+                Log.e(TAG, "addConfig : " + e);
             }
         } else {
             mLocalSession.addConfig(config);
@@ -380,7 +380,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 mHalSession.sendDtmf(digit, duration);
             } catch (RemoteException e) {
-                Rlog.e(TAG, "sendDtmf : " + e);
+                Log.e(TAG, "sendDtmf : " + e);
             }
         } else {
             mLocalSession.sendDtmf(digit, duration);
@@ -392,7 +392,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 mHalSession.startDtmf(digit);
             } catch (RemoteException e) {
-                Rlog.e(TAG, "startDtmf : " + e);
+                Log.e(TAG, "startDtmf : " + e);
             }
         } else {
             mLocalSession.sendDtmf(digit, DTMF_DEFAULT_DURATION);
@@ -404,7 +404,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 mHalSession.stopDtmf();
             } catch (RemoteException e) {
-                Rlog.e(TAG, "stopDtmf : " + e);
+                Log.e(TAG, "stopDtmf : " + e);
             }
         }
     }
@@ -418,7 +418,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
                         .collect(Collectors.toList());
                 mHalSession.sendHeaderExtension(halExtensions);
             } catch (RemoteException e) {
-                Rlog.e(TAG, "sendHeaderExtension : " + e);
+                Log.e(TAG, "sendHeaderExtension : " + e);
             }
         } else {
             mLocalSession.sendHeaderExtension(extensions);
@@ -430,7 +430,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 mHalSession.setMediaQualityThreshold(Utils.convertMediaQualityThreshold(threshold));
             } catch (RemoteException e) {
-                Rlog.e(TAG, "setMediaQualityThreshold: " + e);
+                Log.e(TAG, "setMediaQualityThreshold: " + e);
             }
         } else {
             mLocalSession.setMediaQualityThreshold(threshold);
@@ -442,7 +442,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
             try {
                 ((IImsMediaSession)session).setListener(mOffloadListener);
             } catch (RemoteException e) {
-                Rlog.e(TAG, "Failed to notify openSuccess: " + e);
+                Log.e(TAG, "Failed to notify openSuccess: " + e);
             }
             mHalSession = (IImsMediaSession) session;
         } else {
@@ -452,7 +452,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onOpenSessionSuccess(this);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify openSuccess: " + e);
+            Log.e(TAG, "Failed to notify openSuccess: " + e);
         }
     }
 
@@ -460,7 +460,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onOpenSessionFailure(error);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify openFailure: " + e);
+            Log.e(TAG, "Failed to notify openFailure: " + e);
         }
     }
 
@@ -468,7 +468,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onSessionClosed();
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify SessionClosed: " + e);
+            Log.e(TAG, "Failed to notify SessionClosed: " + e);
         }
     }
 
@@ -476,7 +476,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onModifySessionResponse(config, error);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify modifySessionResponse: " + e);
+            Log.e(TAG, "Failed to notify modifySessionResponse: " + e);
         }
     }
 
@@ -484,7 +484,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onAddConfigResponse(config, error);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify onAddConfigResponse: " + e);
+            Log.e(TAG, "Failed to notify onAddConfigResponse: " + e);
         }
     }
 
@@ -492,7 +492,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onConfirmConfigResponse(config, error);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify onConfirmConfigResponse: " + e);
+            Log.e(TAG, "Failed to notify onConfirmConfigResponse: " + e);
         }
     }
 
@@ -500,7 +500,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onFirstMediaPacketReceived(config);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify first media packet received indication: " + e);
+            Log.e(TAG, "Failed to notify first media packet received indication: " + e);
         }
     }
 
@@ -508,7 +508,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onHeaderExtensionReceived(extensions);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify RTP header extension: " + e);
+            Log.e(TAG, "Failed to notify RTP header extension: " + e);
         }
     }
 
@@ -516,7 +516,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.notifyMediaInactivity(packetType);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify media timeout: " + e);
+            Log.e(TAG, "Failed to notify media timeout: " + e);
         }
 
     }
@@ -525,7 +525,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.notifyPacketLoss(percentage);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify packet loss: " + e);
+            Log.e(TAG, "Failed to notify packet loss: " + e);
         }
     }
 
@@ -533,7 +533,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.notifyJitter(jitter);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify jitter: " + e);
+            Log.e(TAG, "Failed to notify jitter: " + e);
         }
     }
 
@@ -541,7 +541,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.triggerAnbrQuery(config);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to trigger ANBR query: " + e);
+            Log.e(TAG, "Failed to trigger ANBR query: " + e);
         }
     }
 
@@ -549,7 +549,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onDtmfReceived(dtmfDigit);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to Dtmf received: " + e);
+            Log.e(TAG, "Failed to Dtmf received: " + e);
         }
     }
 
@@ -557,7 +557,7 @@ public final class AudioSession extends IImsAudioSession.Stub implements IMediaS
         try {
             mCallback.onCallQualityChanged(callQuality);
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify call quality changed indication: " + e);
+            Log.e(TAG, "Failed to notify call quality changed indication: " + e);
         }
     }
 }
diff --git a/service/src/com/android/telephony/imsmedia/ImsMediaController.java b/service/src/com/android/telephony/imsmedia/ImsMediaController.java
index 098f630d..8573d022 100644
--- a/service/src/com/android/telephony/imsmedia/ImsMediaController.java
+++ b/service/src/com/android/telephony/imsmedia/ImsMediaController.java
@@ -22,7 +22,6 @@ import android.os.IBinder;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.support.annotation.GuardedBy;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.IImsAudioSession;
 import android.telephony.imsmedia.IImsAudioSessionCallback;
 import android.telephony.imsmedia.IImsMedia;
@@ -60,7 +59,7 @@ public class ImsMediaController extends Service {
             final int sessionId = mSessionId.getAndIncrement();
 
             IMediaSession session;
-            Rlog.d(TAG, "openSession: sessionId = " + sessionId
+            Log.d(TAG, "openSession: sessionId = " + sessionId
                     + ", type=" + sessionType + "," + rtpConfig);
             synchronized (mSessions) {
                 switch (sessionType) {
@@ -92,7 +91,7 @@ public class ImsMediaController extends Service {
 
         @Override
         public void closeSession(IBinder session) {
-            Rlog.d(TAG, "closeSession: " + session);
+            Log.d(TAG, "closeSession: " + session);
             synchronized (mSessions) {
                 if (session instanceof AudioSession) {
                     final AudioSession audioSession =
@@ -142,13 +141,13 @@ public class ImsMediaController extends Service {
 
     @Override
     public IBinder onBind(Intent intent) {
-        Rlog.d(TAG, Thread.currentThread().getName() + " onBind");
+        Log.d(TAG, Thread.currentThread().getName() + " onBind");
         return mImsMediaBinder;
     }
 
     @Override
     public boolean onUnbind(Intent intent) {
-        Rlog.d(TAG, Thread.currentThread().getName() + " onUnbind");
+        Log.d(TAG, Thread.currentThread().getName() + " onUnbind");
         try {
             synchronized (mSessions) {
                 while (mSessions.size() > 0) {
@@ -157,19 +156,19 @@ public class ImsMediaController extends Service {
                 mSessions.clear();
             }
         } catch (Exception e) {
-            Rlog.d(TAG, "onUnbind: e=" + e);
+            Log.d(TAG, "onUnbind: e=" + e);
         }
         return true;
     }
 
     @Override
     public void onCreate() {
-        Rlog.d(TAG, "onCreate");
+        Log.d(TAG, "onCreate");
     }
 
     @Override
     public void onDestroy() {
-        Rlog.d(TAG, "onDestroy");
+        Log.d(TAG, "onDestroy");
     }
 
     private IMediaSession getSession(int sessionId) {
@@ -195,7 +194,7 @@ public class ImsMediaController extends Service {
          */
         public void onSessionClosed(int sessionId) {
             getSession(sessionId).onSessionClosed();
-            Rlog.d(TAG, "onSessionClosed: sessionId = " + sessionId);
+            Log.d(TAG, "onSessionClosed: sessionId = " + sessionId);
             mSessions.remove(sessionId);
         }
     }
diff --git a/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java b/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java
index 77cef4f0..a932adce 100644
--- a/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java
+++ b/service/src/com/android/telephony/imsmedia/JNIImsMediaService.java
@@ -18,7 +18,7 @@ package com.android.telephony.imsmedia;
 
 import android.content.res.AssetManager;
 import android.os.Parcel;
-import android.telephony.Rlog;
+import android.util.Log;
 import android.view.Surface;
 
 import java.util.Hashtable;
@@ -105,7 +105,7 @@ public class JNIImsMediaService {
      * @param listener A listener to set for getting messages
      */
     public static void setListener(final long nativeObj, final JNIImsMediaListener listener) {
-        Rlog.d(TAG,"setListener");
+        Log.d(TAG, "setListener");
         if (nativeObj == 0 || listener == null) {
             return;
         }
@@ -122,7 +122,7 @@ public class JNIImsMediaService {
      * @return A JNIImsMediaListener listener
      */
     public static JNIImsMediaListener getListener(final long nativeObj) {
-        Rlog.d(TAG,"getListener");
+        Log.d(TAG, "getListener");
         if (nativeObj == 0) {
             return null;
         }
@@ -143,11 +143,11 @@ public class JNIImsMediaService {
      * @return 1 if it is success to send data, -1 when it fails
      */
     public static int sendData2Java(final long nativeObj, final byte[] baData) {
-        Rlog.d(TAG,"sendData2Java");
+        Log.d(TAG, "sendData2Java");
         JNIImsMediaListener listener = getListener(nativeObj);
 
         if (listener == null) {
-            Rlog.e(TAG, "No listener :: nativeObject=" + nativeObj);
+            Log.e(TAG, "No listener :: nativeObject=" + nativeObj);
             return -1;
         }
 
@@ -165,11 +165,11 @@ public class JNIImsMediaService {
     /** local shared libimsmediajni library */
     static {
         try {
-            Rlog.d(TAG, "libimsmedia :: loading");
+            Log.d(TAG, "libimsmedia :: loading");
             System.loadLibrary("imsmedia");
-            Rlog.d(TAG, "libimsmedia :: load completed");
+            Log.d(TAG, "libimsmedia :: load completed");
         } catch (UnsatisfiedLinkError e) {
-            Rlog.e(TAG, "Loading fail : libimsmedia.so");
+            Log.e(TAG, "Loading fail : libimsmedia.so");
         }
     }
 }
diff --git a/service/src/com/android/telephony/imsmedia/TextListener.java b/service/src/com/android/telephony/imsmedia/TextListener.java
index cbe0e07c..eff54d51 100644
--- a/service/src/com/android/telephony/imsmedia/TextListener.java
+++ b/service/src/com/android/telephony/imsmedia/TextListener.java
@@ -18,8 +18,8 @@ package com.android.telephony.imsmedia;
 
 import android.os.Handler;
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.TextConfig;
+import android.util.Log;
 
 /**
  * Text listener to process JNI messages from local AP based RTP stack
@@ -64,23 +64,23 @@ public class TextListener implements JNIImsMediaListener {
         switch (event) {
             case TextSession.EVENT_OPEN_SESSION_SUCCESS:
                 final int sessionId = parcel.readInt();
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onOpenSessionSuccess(sessionId,
                         new TextLocalSession(sessionId, mNativeObject));
                 break;
             case TextSession.EVENT_OPEN_SESSION_FAILURE:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onOpenSessionFailure(parcel.readInt(),
                         parcel.readInt());
                 break;
             case TextSession.EVENT_SESSION_CLOSED:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onSessionClosed(parcel.readInt());
                 break;
             case TextSession.EVENT_MODIFY_SESSION_RESPONSE:
                 final int result = parcel.readInt();
                 final TextConfig config = TextConfig.CREATOR.createFromParcel(parcel);
-                Rlog.d(LOG_TAG, "onMessage=" + event + ", result=" + result);
+                Log.d(LOG_TAG, "onMessage=" + event + ", result=" + result);
                 Utils.sendMessage(mHandler, event, result, Utils.UNUSED, config);
                 break;
             case TextSession.EVENT_MEDIA_INACTIVITY_IND:
@@ -88,7 +88,7 @@ public class TextListener implements JNIImsMediaListener {
                 break;
             case TextSession.EVENT_RTT_RECEIVED:
                 final String text = parcel.readString();
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 Utils.sendMessage(mHandler, event, text);
                 break;
             default:
diff --git a/service/src/com/android/telephony/imsmedia/TextLocalSession.java b/service/src/com/android/telephony/imsmedia/TextLocalSession.java
index 4f60710e..f0f0ebf1 100644
--- a/service/src/com/android/telephony/imsmedia/TextLocalSession.java
+++ b/service/src/com/android/telephony/imsmedia/TextLocalSession.java
@@ -17,9 +17,9 @@
 package com.android.telephony.imsmedia;
 
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.MediaQualityThreshold;
 import android.telephony.imsmedia.TextConfig;
+import android.util.Log;
 
 /**
  * Text session implementation for internal AP based RTP stack. This handles all API calls from
@@ -43,7 +43,7 @@ public class TextLocalSession {
 
     /** Returns the unique session identifier */
     public int getSessionId() {
-        Rlog.d(TAG, "getSessionId");
+        Log.d(TAG, "getSessionId");
         return mSessionId;
     }
 
@@ -74,7 +74,7 @@ public class TextLocalSession {
      * @param config provides remote end point info and codec details
      */
     public void modifySession(final TextConfig config) {
-        Rlog.d(TAG, "modifySession: " + config);
+        Log.d(TAG, "modifySession: " + config);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(TextSession.CMD_MODIFY_SESSION);
         if (config != null) {
@@ -90,7 +90,7 @@ public class TextLocalSession {
      * @param threshold media quality thresholds for various quality parameters
      */
     public void setMediaQualityThreshold(final MediaQualityThreshold threshold) {
-        Rlog.d(TAG, "setMediaQualityThreshold: " + threshold);
+        Log.d(TAG, "setMediaQualityThreshold: " + threshold);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(TextSession.CMD_SET_MEDIA_QUALITY_THRESHOLD);
         if (threshold != null) {
@@ -105,7 +105,7 @@ public class TextLocalSession {
      * @param text The text string
      */
     public void sendRtt(String text) {
-        Rlog.d(TAG, "sendRtt");
+        Log.d(TAG, "sendRtt");
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(TextSession.CMD_SEND_RTT);
         parcel.writeString(text);
diff --git a/service/src/com/android/telephony/imsmedia/TextService.java b/service/src/com/android/telephony/imsmedia/TextService.java
index 5e9e7dbe..33bd33f7 100644
--- a/service/src/com/android/telephony/imsmedia/TextService.java
+++ b/service/src/com/android/telephony/imsmedia/TextService.java
@@ -17,8 +17,8 @@
 package com.android.telephony.imsmedia;
 
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.ImsMediaSession;
+import android.util.Log;
 
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
 
@@ -78,7 +78,7 @@ public class TextService {
         if (sessionParams == null) {
             return;
         }
-        Rlog.d(LOG_TAG, "openSession: sessionId = " + sessionId
+        Log.d(LOG_TAG, "openSession: sessionId = " + sessionId
                     + "," + sessionParams.getRtpConfig());
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(TextSession.CMD_OPEN_SESSION);
@@ -99,7 +99,7 @@ public class TextService {
      * @param sessionId The session id to be closed.
      */
     public void closeSession(final int sessionId) {
-        Rlog.d(LOG_TAG, "closeSession");
+        Log.d(LOG_TAG, "closeSession");
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(TextSession.CMD_CLOSE_SESSION);
         sendRequest(sessionId, parcel);
diff --git a/service/src/com/android/telephony/imsmedia/TextSession.java b/service/src/com/android/telephony/imsmedia/TextSession.java
index 9521c504..8accf840 100644
--- a/service/src/com/android/telephony/imsmedia/TextSession.java
+++ b/service/src/com/android/telephony/imsmedia/TextSession.java
@@ -22,11 +22,11 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.VisibleForTesting;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.IImsTextSession;
 import android.telephony.imsmedia.IImsTextSessionCallback;
 import android.telephony.imsmedia.MediaQualityThreshold;
 import android.telephony.imsmedia.TextConfig;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -64,7 +64,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         mSessionId = sessionId;
         mCallback = callback;
         mHandler = new TextSessionHandler(Looper.getMainLooper());
-        Rlog.d(TAG, "Initialize local text service");
+        Log.d(TAG, "Initialize local text service");
         mTextService = new TextService();
         mTextListener = new TextListener(mHandler);
         mTextService.setListener(mTextListener);
@@ -111,37 +111,37 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
 
     @Override
     public void modifySession(TextConfig config) {
-        Rlog.d(TAG, "modifySession: " + config);
+        Log.d(TAG, "modifySession: " + config);
         Utils.sendMessage(mHandler, CMD_MODIFY_SESSION, config);
     }
 
     @Override
     public void setMediaQualityThreshold(MediaQualityThreshold threshold) {
-        Rlog.d(TAG, "setMediaQualityThreshold: " + threshold);
+        Log.d(TAG, "setMediaQualityThreshold: " + threshold);
         Utils.sendMessage(mHandler, CMD_SET_MEDIA_QUALITY_THRESHOLD, threshold);
     }
 
     @Override
     public void sendRtt(String text) {
-        Rlog.d(TAG, "sendRtt: ");
+        Log.d(TAG, "sendRtt: ");
         Utils.sendMessage(mHandler, CMD_SEND_RTT, text);
     }
 
     @Override
     public void onOpenSessionSuccess(Object session) {
-        Rlog.d(TAG, "onOpenSessionSuccess");
+        Log.d(TAG, "onOpenSessionSuccess");
         Utils.sendMessage(mHandler, EVENT_OPEN_SESSION_SUCCESS, session);
     }
 
     @Override
     public void onOpenSessionFailure(int error) {
-        Rlog.d(TAG, "onOpenSessionFailure: error=" + error);
+        Log.d(TAG, "onOpenSessionFailure: error=" + error);
         Utils.sendMessage(mHandler, EVENT_OPEN_SESSION_FAILURE, error);
     }
 
     @Override
     public void onSessionClosed() {
-        Rlog.d(TAG, "onSessionClosed");
+        Log.d(TAG, "onSessionClosed");
         Utils.sendMessage(mHandler, EVENT_SESSION_CLOSED);
     }
 
@@ -155,7 +155,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
 
         @Override
         public void handleMessage(Message msg) {
-            Rlog.d(TAG, "handleMessage: " + msg.what);
+            Log.d(TAG, "handleMessage: " + msg.what);
             switch (msg.what) {
                 case CMD_OPEN_SESSION:
                     handleOpenSession((OpenSessionParams) msg.obj);
@@ -197,12 +197,12 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
 
     private void handleOpenSession(OpenSessionParams sessionParams) {
         mTextListener.setMediaCallback(sessionParams.getCallback());
-        Rlog.d(TAG, "handleOpenSession");
+        Log.d(TAG, "handleOpenSession");
         mTextService.openSession(mSessionId, sessionParams);
     }
 
     private void handleCloseSession() {
-        Rlog.d(TAG, "handleCloseSession");
+        Log.d(TAG, "handleCloseSession");
         mTextService.closeSession(mSessionId);
     }
 
@@ -223,7 +223,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         try {
             mCallback.onOpenSessionSuccess(this);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify openSuccess: " + e);
+            Log.e(TAG, "Failed to notify openSuccess: " + e);
         }
     }
 
@@ -231,7 +231,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         try {
             mCallback.onOpenSessionFailure(error);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify openFailure: " + e);
+            Log.e(TAG, "Failed to notify openFailure: " + e);
         }
     }
 
@@ -239,7 +239,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         try {
             mCallback.onSessionClosed();
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify SessionClosed: " + e);
+            Log.e(TAG, "Failed to notify SessionClosed: " + e);
         }
     }
 
@@ -247,7 +247,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         try {
             mCallback.onModifySessionResponse(config, error);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify modifySessionResponse: " + e);
+            Log.e(TAG, "Failed to notify modifySessionResponse: " + e);
         }
     }
 
@@ -255,7 +255,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         try {
             mCallback.notifyMediaInactivity(packetType);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify media timeout: " + e);
+            Log.e(TAG, "Failed to notify media timeout: " + e);
         }
     }
 
@@ -263,7 +263,7 @@ public final class TextSession extends IImsTextSession.Stub implements IMediaSes
         try {
             mCallback.onRttReceived(text);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify rtt received: " + e);
+            Log.e(TAG, "Failed to notify rtt received: " + e);
         }
     }
 }
diff --git a/service/src/com/android/telephony/imsmedia/VideoListener.java b/service/src/com/android/telephony/imsmedia/VideoListener.java
index 06165f28..8f2e3e42 100644
--- a/service/src/com/android/telephony/imsmedia/VideoListener.java
+++ b/service/src/com/android/telephony/imsmedia/VideoListener.java
@@ -18,8 +18,8 @@ package com.android.telephony.imsmedia;
 
 import android.os.Handler;
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.VideoConfig;
+import android.util.Log;
 
 /**
  * Video listener to process JNI messages from local AP based RTP stack
@@ -64,23 +64,23 @@ public class VideoListener implements JNIImsMediaListener {
         switch (event) {
             case VideoSession.EVENT_OPEN_SESSION_SUCCESS:
                 final int sessionId = parcel.readInt();
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onOpenSessionSuccess(sessionId,
                         new VideoLocalSession(sessionId, mNativeObject));
                 break;
             case VideoSession.EVENT_OPEN_SESSION_FAILURE:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onOpenSessionFailure(parcel.readInt(), parcel.readInt());
                 break;
             case VideoSession.EVENT_SESSION_CLOSED:
-                Rlog.d(LOG_TAG, "onMessage=" + event);
+                Log.d(LOG_TAG, "onMessage=" + event);
                 mCallback.onSessionClosed(parcel.readInt());
                 break;
             case VideoSession.EVENT_MODIFY_SESSION_RESPONSE:
             {
                 final int result = parcel.readInt();
                 final VideoConfig config = VideoConfig.CREATOR.createFromParcel(parcel);
-                Rlog.d(LOG_TAG, "onMessage=" + event + ", result=" + result);
+                Log.d(LOG_TAG, "onMessage=" + event + ", result=" + result);
                 Utils.sendMessage(mHandler, event, result, Utils.UNUSED, config);
             }
                 break;
diff --git a/service/src/com/android/telephony/imsmedia/VideoLocalSession.java b/service/src/com/android/telephony/imsmedia/VideoLocalSession.java
index 53b058f9..743ed8b8 100644
--- a/service/src/com/android/telephony/imsmedia/VideoLocalSession.java
+++ b/service/src/com/android/telephony/imsmedia/VideoLocalSession.java
@@ -17,10 +17,10 @@
 package com.android.telephony.imsmedia;
 
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.ims.RtpHeaderExtension;
 import android.telephony.imsmedia.MediaQualityThreshold;
 import android.telephony.imsmedia.VideoConfig;
+import android.util.Log;
 import android.view.Surface;
 
 import java.util.List;
@@ -45,7 +45,7 @@ public class VideoLocalSession {
 
     /** Returns the unique session identifier */
     public int getSessionId() {
-        Rlog.d(TAG, "getSessionId");
+        Log.d(TAG, "getSessionId");
         return mSessionId;
     }
 
@@ -74,7 +74,7 @@ public class VideoLocalSession {
      * @param config provides remote end point info and codec details
      */
     public void modifySession(final VideoConfig config) {
-        Rlog.d(TAG, "modifySession: " + config);
+        Log.d(TAG, "modifySession: " + config);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(VideoSession.CMD_MODIFY_SESSION);
         if (config != null) {
@@ -115,7 +115,7 @@ public class VideoLocalSession {
      *        parameters
      */
     public void setMediaQualityThreshold(final MediaQualityThreshold threshold) {
-        Rlog.d(TAG, "setMediaQualityThreshold: " + threshold);
+        Log.d(TAG, "setMediaQualityThreshold: " + threshold);
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(VideoSession.CMD_SET_MEDIA_QUALITY_THRESHOLD);
         if (threshold != null) {
@@ -130,7 +130,7 @@ public class VideoLocalSession {
      * @param extensions List of RTP header extensions to be transmitted
      */
     public void sendHeaderExtension(final List<RtpHeaderExtension> extensions) {
-        Rlog.d(TAG, "sendHeaderExtension");
+        Log.d(TAG, "sendHeaderExtension");
         // TODO: add implementation
     }
 
@@ -139,7 +139,7 @@ public class VideoLocalSession {
      * video streaming session.
      */
     public void requestVideoDataUsage() {
-        Rlog.d(TAG, "requestVideoDataUsage");
+        Log.d(TAG, "requestVideoDataUsage");
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(VideoSession.CMD_REQUEST_VIDEO_DATA_USAGE);
         sendRequest(mSessionId, parcel);
diff --git a/service/src/com/android/telephony/imsmedia/VideoService.java b/service/src/com/android/telephony/imsmedia/VideoService.java
index 526e6a62..661f5aa9 100644
--- a/service/src/com/android/telephony/imsmedia/VideoService.java
+++ b/service/src/com/android/telephony/imsmedia/VideoService.java
@@ -17,8 +17,8 @@
 package com.android.telephony.imsmedia;
 
 import android.os.Parcel;
-import android.telephony.Rlog;
 import android.telephony.imsmedia.ImsMediaSession;
+import android.util.Log;
 
 import com.android.telephony.imsmedia.Utils.OpenSessionParams;
 
@@ -79,7 +79,7 @@ public class VideoService {
         if (sessionParams == null) {
             return;
         }
-        Rlog.d(LOG_TAG, "openSession: sessionId = " + sessionId
+        Log.d(LOG_TAG, "openSession: sessionId = " + sessionId
                     + "," + sessionParams.getRtpConfig());
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(VideoSession.CMD_OPEN_SESSION);
@@ -101,7 +101,7 @@ public class VideoService {
      * @param sessionId RTP session to be closed.
      */
     public void closeSession(final int sessionId) {
-        Rlog.d(LOG_TAG, "closeSession");
+        Log.d(LOG_TAG, "closeSession");
         Parcel parcel = Parcel.obtain();
         parcel.writeInt(VideoSession.CMD_CLOSE_SESSION);
         sendRequest(sessionId, parcel);
diff --git a/service/src/com/android/telephony/imsmedia/VideoSession.java b/service/src/com/android/telephony/imsmedia/VideoSession.java
index 4d767606..03cfe081 100644
--- a/service/src/com/android/telephony/imsmedia/VideoSession.java
+++ b/service/src/com/android/telephony/imsmedia/VideoSession.java
@@ -22,12 +22,12 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.VisibleForTesting;
-import android.telephony.Rlog;
 import android.telephony.ims.RtpHeaderExtension;
 import android.telephony.imsmedia.IImsVideoSession;
 import android.telephony.imsmedia.IImsVideoSessionCallback;
 import android.telephony.imsmedia.MediaQualityThreshold;
 import android.telephony.imsmedia.VideoConfig;
+import android.util.Log;
 import android.view.Surface;
 
 import androidx.annotation.NonNull;
@@ -76,7 +76,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         mSessionId = sessionId;
         mCallback = callback;
         mHandler = new VideoSessionHandler(Looper.getMainLooper());
-        Rlog.d(TAG, "Initialize local video service");
+        Log.d(TAG, "Initialize local video service");
         mVideoService = new VideoService();
         mVideoListener = new VideoListener(mHandler);
         mVideoService.setListener(mVideoListener);
@@ -123,55 +123,55 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
 
     @Override
     public void modifySession(VideoConfig config) {
-        Rlog.d(TAG, "modifySession: " + config);
+        Log.d(TAG, "modifySession: " + config);
         Utils.sendMessage(mHandler, CMD_MODIFY_SESSION, config);
     }
 
     @Override
     public void setPreviewSurface(Surface surface) {
-        Rlog.d(TAG, "setPreviewSurface: " + surface);
+        Log.d(TAG, "setPreviewSurface: " + surface);
         Utils.sendMessage(mHandler, CMD_SET_PREVIEW_SURFACE, surface);
     }
 
     @Override
     public void setDisplaySurface(Surface surface) {
-        Rlog.d(TAG, "setDisplaySurface: " + surface);
+        Log.d(TAG, "setDisplaySurface: " + surface);
         Utils.sendMessage(mHandler, CMD_SET_DISPLAY_SURFACE, surface);
     }
 
     @Override
     public void sendHeaderExtension(List<RtpHeaderExtension> extensions) {
-        Rlog.d(TAG, "sendHeaderExtension");
+        Log.d(TAG, "sendHeaderExtension");
         Utils.sendMessage(mHandler, CMD_SEND_RTP_HDR_EXTN, extensions);
     }
 
     @Override
     public void setMediaQualityThreshold(MediaQualityThreshold threshold) {
-        Rlog.d(TAG, "setMediaQualityThreshold: " + threshold);
+        Log.d(TAG, "setMediaQualityThreshold: " + threshold);
         Utils.sendMessage(mHandler, CMD_SET_MEDIA_QUALITY_THRESHOLD, threshold);
     }
 
     @Override
     public void requestVideoDataUsage() {
-        Rlog.d(TAG, "requestVideoDataUsage: ");
+        Log.d(TAG, "requestVideoDataUsage: ");
         Utils.sendMessage(mHandler, CMD_REQUEST_VIDEO_DATA_USAGE);
     }
 
     @Override
     public void onOpenSessionSuccess(Object session) {
-        Rlog.d(TAG, "onOpenSessionSuccess");
+        Log.d(TAG, "onOpenSessionSuccess");
         Utils.sendMessage(mHandler, EVENT_OPEN_SESSION_SUCCESS, session);
     }
 
     @Override
     public void onOpenSessionFailure(int error) {
-        Rlog.d(TAG, "onOpenSessionFailure: error=" + error);
+        Log.d(TAG, "onOpenSessionFailure: error=" + error);
         Utils.sendMessage(mHandler, EVENT_OPEN_SESSION_FAILURE, error);
     }
 
     @Override
     public void onSessionClosed() {
-        Rlog.d(TAG, "onSessionClosed");
+        Log.d(TAG, "onSessionClosed");
         Utils.sendMessage(mHandler, EVENT_SESSION_CLOSED);
     }
 
@@ -185,7 +185,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
 
         @Override
         public void handleMessage(Message msg) {
-            Rlog.d(TAG, "handleMessage: " + msg.what);
+            Log.d(TAG, "handleMessage: " + msg.what);
             switch(msg.what) {
                 case CMD_OPEN_SESSION:
                     handleOpenSession((OpenSessionParams) msg.obj);
@@ -248,12 +248,12 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
 
     private void handleOpenSession(OpenSessionParams sessionParams) {
         mVideoListener.setMediaCallback(sessionParams.getCallback());
-        Rlog.d(TAG, "handleOpenSession");
+        Log.d(TAG, "handleOpenSession");
         mVideoService.openSession(mSessionId, sessionParams);
     }
 
     private void handleCloseSession() {
-        Rlog.d(TAG, "handleCloseSession");
+        Log.d(TAG, "handleCloseSession");
         mVideoService.closeSession(mSessionId);
     }
 
@@ -286,7 +286,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onOpenSessionSuccess(this);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify openSuccess: " + e);
+            Log.e(TAG, "Failed to notify openSuccess: " + e);
         }
     }
 
@@ -294,7 +294,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onOpenSessionFailure(error);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify openFailure: " + e);
+            Log.e(TAG, "Failed to notify openFailure: " + e);
         }
     }
 
@@ -302,7 +302,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onSessionClosed();
         }  catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify SessionClosed: " + e);
+            Log.e(TAG, "Failed to notify SessionClosed: " + e);
         }
     }
 
@@ -310,7 +310,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onModifySessionResponse(config, error);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify modifySessionResponse: " + e);
+            Log.e(TAG, "Failed to notify modifySessionResponse: " + e);
         }
     }
 
@@ -318,7 +318,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onFirstMediaPacketReceived(config);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify first media packet received indication: " + e);
+            Log.e(TAG, "Failed to notify first media packet received indication: " + e);
         }
     }
 
@@ -326,7 +326,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onPeerDimensionChanged(width, height);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify dimension changed: " + e);
+            Log.e(TAG, "Failed to notify dimension changed: " + e);
         }
     }
 
@@ -334,7 +334,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.onHeaderExtensionReceived(extensions);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify RTP header extension: " + e);
+            Log.e(TAG, "Failed to notify RTP header extension: " + e);
         }
     }
 
@@ -342,7 +342,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.notifyMediaInactivity(packetType);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify media timeout: " + e);
+            Log.e(TAG, "Failed to notify media timeout: " + e);
         }
     }
 
@@ -350,7 +350,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.notifyPacketLoss(percentage);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify packet loss: " + e);
+            Log.e(TAG, "Failed to notify packet loss: " + e);
         }
     }
 
@@ -358,7 +358,7 @@ public final class VideoSession extends IImsVideoSession.Stub implements IMediaS
         try {
             mCallback.notifyVideoDataUsage(bytes);
         } catch (RemoteException e) {
-            Rlog.e(TAG, "Failed to notify video data usage: " + e);
+            Log.e(TAG, "Failed to notify video data usage: " + e);
         }
     }
 }