Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad3b7f5c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I8e7c06ffbf787472e93e682eec6a177f48c7ed2e
parents 3f15b59b ac9142cb

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

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import java.util.concurrent.Executor; 
 */

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 @@ public class FeatureConnector<T extends IFeatureConnector> extends Handler { 
        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 @@ public class FeatureConnector<T extends IFeatureConnector> extends Handler { 
            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

+1 −3
Original line number Diff line number Diff line
@@ -133,10 +133,8 @@ public class RcsFeatureConnection extends FeatureConnection { 
            // 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

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ public class RcsFeatureManager implements IFeatureConnector { 
    public RcsFeatureManager(Context context, int slotId) {

        mContext = context;

        mSlotId = slotId;

        logi("RcsFeatureManager");



        createImsService();

    }