commit e532d237c4c67e79e0dec976b3d9d1cb39f40cdf
author Jordan Liu <jminjie@google.com> Mon Dec 16 15:35:27 2019 -0800
committer Jordan Liu <jminjie@google.com> Mon Dec 16 16:23:32 2019 -0800
tree c2c77c7d42fd0396f8a22f217ad37105406e99bb
parent 7681d11869c84c2f46a1846f0f4540343e1e37bc

Replace Rlog with Log temporarily

Test: manual
Bug: 135956699
Change-Id: I112457f83e5d43ca0d3d18a3ba384a5763e5e403

src/com/android/cellbroadcastservice/BearerData.java

diff --git a/src/com/android/cellbroadcastservice/BearerData.java b/src/com/android/cellbroadcastservice/BearerData.java
index d73339c..032266a 100644
--- a/src/com/android/cellbroadcastservice/BearerData.java
+++ b/src/com/android/cellbroadcastservice/BearerData.java
@@ -17,9 +17,9 @@
 package com.android.cellbroadcastservice;
 
 import android.content.Context;
-import android.telephony.Rlog;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.cdma.CdmaSmsCbProgramData;
+import android.util.Log;
 
 /**
  * An object to decode CDMA SMS bearer data.
@@ -194,7 +194,7 @@
             inStream.skip(3);
         }
         if ((!decodeSuccess) || (paramBits > 0)) {
-            Rlog.d(LOG_TAG, "MESSAGE_IDENTIFIER decode "
+            Log.d(LOG_TAG, "MESSAGE_IDENTIFIER decode "
                     + (decodeSuccess ? "succeeded" : "failed")
                     + " (extra bits = " + paramBits + ")");
         }
@@ -211,7 +211,7 @@
             decodeSuccess = true;
             inStream.skip(paramBits);
         }
-        Rlog.d(LOG_TAG, "RESERVED bearer data subparameter " + subparamId + " decode "
+        Log.d(LOG_TAG, "RESERVED bearer data subparameter " + subparamId + " decode "
                 + (decodeSuccess ? "succeeded" : "failed") + " (param bits = " + paramBits + ")");
         if (!decodeSuccess) {
             throw new CodingException("RESERVED bearer data subparameter " + subparamId
@@ -263,7 +263,7 @@
             if (maxNumFields < 0) {
                 throw new CodingException(charset + " decode failed: offset out of range");
             }
-            Rlog.e(LOG_TAG, charset + " decode error: offset = " + offset + " numFields = "
+            Log.e(LOG_TAG, charset + " decode error: offset = " + offset + " numFields = "
                     + numFields + " data.length = " + data.length + " maxNumFields = "
                     + maxNumFields);
             numFields = maxNumFields;
@@ -432,7 +432,7 @@
             bData.language = inStream.read(8);
         }
         if ((!decodeSuccess) || (paramBits > 0)) {
-            Rlog.d(LOG_TAG, "LANGUAGE_INDICATOR decode "
+            Log.d(LOG_TAG, "LANGUAGE_INDICATOR decode "
                     + (decodeSuccess ? "succeeded" : "failed")
                     + " (extra bits = " + paramBits + ")");
         }
@@ -452,7 +452,7 @@
             inStream.skip(6);
         }
         if ((!decodeSuccess) || (paramBits > 0)) {
-            Rlog.d(LOG_TAG, "PRIORITY_INDICATOR decode "
+            Log.d(LOG_TAG, "PRIORITY_INDICATOR decode "
                     + (decodeSuccess ? "succeeded" : "failed")
                     + " (extra bits = " + paramBits + ")");
         }
@@ -553,7 +553,7 @@
                     break;
 
                 default:
-                    Rlog.w(LOG_TAG, "skipping unsupported CMAS record type " + recordType);
+                    Log.w(LOG_TAG, "skipping unsupported CMAS record type " + recordType);
                     inStream.skip(recordLen * 8);
                     break;
             }
@@ -631,9 +631,9 @@
             }
             return bData;
         } catch (BitwiseInputStream.AccessException ex) {
-            Rlog.e(LOG_TAG, "BearerData decode failed: " + ex);
+            Log.e(LOG_TAG, "BearerData decode failed: " + ex);
         } catch (CodingException ex) {
-            Rlog.e(LOG_TAG, "BearerData decode failed: " + ex);
+            Log.e(LOG_TAG, "BearerData decode failed: " + ex);
         }
         return null;
     }