commit ac9142cbbd5d365d0a30d6d18546ffe60af2fc12
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 00:22:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 00:22:17 2020 +0000
tree 2d2e6c9e10f8afeb90bcb5f3272042109467974a
parent 04fe1c5732f396adb308bc2554bbf347e6bdfa26
parent 0a213c4f318dc02672f4f8fbb5bae3fbcbc1a78e

Merge "Reduce the log spam in some of the IMS classes" am: 0a213c4f31

Change-Id: Idb31c19d6f1869344880122e64d2902026a73e1a

src/java/com/android/ims/FeatureConnector.java

diff --git a/src/java/com/android/ims/FeatureConnector.java b/src/java/com/android/ims/FeatureConnector.java
index 273dd95..e7c1c74 100644
--- a/src/java/com/android/ims/FeatureConnector.java
+++ b/src/java/com/android/ims/FeatureConnector.java
@@ -34,7 +34,7 @@
  */
 public class FeatureConnector<T extends IFeatureConnector> extends Handler {
     private static final String TAG = "FeatureConnector";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     // Initial condition for ims connection retry.
     private static final int IMS_RETRY_STARTING_TIMEOUT_MS = 500; // ms
@@ -206,7 +206,7 @@
         removeCallbacks(mGetServiceRunnable);
         int timeout = mRetryTimeout.get();
         postDelayed(mGetServiceRunnable, timeout);
-        if (DBG) log("retryGetImsService: unavailable, retrying in " + timeout + " seconds");
+        if (DBG) log("retryGetImsService: unavailable, retrying in " + timeout + " ms");
     }
 
     // Callback fires when IMS Feature changes state
@@ -264,7 +264,7 @@
             mListener.connectionReady(manager);
         }
         catch (ImsException e) {
-            logw("notifyReady exception: " + e.getMessage());
+            if(DBG) log("notifyReady exception: " + e.getMessage());
             throw e;
         }
         // Only reset retry count if connectionReady does not generate an ImsException/

src/java/com/android/ims/RcsFeatureConnection.java

diff --git a/src/java/com/android/ims/RcsFeatureConnection.java b/src/java/com/android/ims/RcsFeatureConnection.java
index daee6dd..e9b751e 100644
--- a/src/java/com/android/ims/RcsFeatureConnection.java
+++ b/src/java/com/android/ims/RcsFeatureConnection.java
@@ -133,10 +133,8 @@
             // Trigger the cache to be updated for feature status.
             serviceProxy.getFeatureState();
         } else {
-            Rlog.w(TAG, "create: binder is null! Slot Id: " + slotId);
+            Rlog.i(TAG, "create: binder is null! Slot Id: " + slotId);
         }
-
-        Rlog.d(TAG, "create: RcsFeatureConnection done");
         return serviceProxy;
     }
 

src/java/com/android/ims/RcsFeatureManager.java

diff --git a/src/java/com/android/ims/RcsFeatureManager.java b/src/java/com/android/ims/RcsFeatureManager.java
index 3fe9212..7f1f819 100644
--- a/src/java/com/android/ims/RcsFeatureManager.java
+++ b/src/java/com/android/ims/RcsFeatureManager.java
@@ -154,7 +154,6 @@
     public RcsFeatureManager(Context context, int slotId) {
         mContext = context;
         mSlotId = slotId;
-        logi("RcsFeatureManager");
 
         createImsService();
     }