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

Commit 3e3026b0 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Add Dumpsys for UCE PUBLISH 

Bug: 79865685
Test: adb shell dumpsys phone
Merged-In: Iad447f66aad47e305a2ada881d418483b3ec01a0
Change-Id: Iad447f66aad47e305a2ada881d418483b3ec01a0
parent e1eecb35

src/java/com/android/ims/rcs/uce/UceController.java

+23 −3
Original line number Diff line number Diff line
@@ -28,18 +28,16 @@ import android.telephony.ims.RcsContactUceCapability.CapabilityMechanism; 
import android.telephony.ims.RcsUceAdapter;

import android.telephony.ims.RcsUceAdapter.PublishState;

import android.telephony.ims.RcsUceAdapter.StackPublishTriggerType;

import android.telephony.ims.aidl.ICapabilityExchangeEventListener;

import android.telephony.ims.aidl.IOptionsRequestCallback;

import android.telephony.ims.aidl.IOptionsResponseCallback;

import android.telephony.ims.aidl.IRcsUceControllerCallback;

import android.telephony.ims.aidl.IRcsUcePublishStateCallback;

import android.util.LocalLog;

import android.util.Log;



import com.android.ims.RcsFeatureManager;

import com.android.ims.rcs.uce.eab.EabCapabilityResult;

import com.android.ims.rcs.uce.eab.EabController;

import com.android.ims.rcs.uce.eab.EabControllerImpl;

import com.android.ims.rcs.uce.eab.EabUtil;

import com.android.ims.rcs.uce.options.OptionsController;

import com.android.ims.rcs.uce.options.OptionsControllerImpl;

import com.android.ims.rcs.uce.presence.publish.PublishController;
@@ -49,7 +47,9 @@ import com.android.ims.rcs.uce.presence.subscribe.SubscribeControllerImpl; 
import com.android.ims.rcs.uce.request.UceRequestManager;

import com.android.ims.rcs.uce.util.UceUtils;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;



import java.io.PrintWriter;

import java.time.Duration;

import java.time.Instant;

import java.time.temporal.ChronoUnit;
@@ -195,6 +195,7 @@ public class UceController { 


    private final int mSubId;

    private final Context mContext;

    private final LocalLog mLocalLog = new LocalLog(UceUtils.LOG_SIZE);

    private volatile boolean mIsRcsConnected;

    private volatile boolean mIsDestroyedFlag;

    private Looper mLooper;
@@ -618,16 +619,35 @@ public class UceController { 
        }

    }



    public void dump(PrintWriter printWriter) {

        IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, "  ");

        pw.println("UceController" + "[subId: " + mSubId + "]:");

        pw.increaseIndent();



        pw.println("Log:");

        pw.increaseIndent();

        mLocalLog.dump(pw);

        pw.decreaseIndent();

        pw.println("---");



        mPublishController.dump(pw);



        pw.decreaseIndent();

    }



    private void logd(String log) {

        Log.d(LOG_TAG, getLogPrefix().append(log).toString());

        mLocalLog.log("[D] " + log);

    }



    private void logi(String log) {

        Log.i(LOG_TAG, getLogPrefix().append(log).toString());

        mLocalLog.log("[I] " + log);

    }



    private void logw(String log) {

        Log.w(LOG_TAG, getLogPrefix().append(log).toString());

        mLocalLog.log("[W] " + log);

    }



    private StringBuilder getLogPrefix() {

src/java/com/android/ims/rcs/uce/presence/publish/PublishController.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.telephony.ims.aidl.IRcsUcePublishStateCallback; 


import com.android.ims.rcs.uce.ControllerBase;



import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.time.Instant;
@@ -152,4 +153,9 @@ public interface PublishController extends ControllerBase { 
     * Removes an existing {@link PublishStateCallback}.

     */

    void unregisterPublishStateCallback(@NonNull IRcsUcePublishStateCallback c);



    /**

     * Dump the state of this PublishController to the printWriter.

     */

    void dump(PrintWriter printWriter);

}

src/java/com/android/ims/rcs/uce/presence/publish/PublishControllerImpl.java

+35 −0
Original line number Diff line number Diff line
@@ -31,13 +31,16 @@ import android.telephony.ims.RcsUceAdapter.PublishState; 
import android.telephony.ims.aidl.IImsCapabilityCallback;

import android.telephony.ims.aidl.IRcsUcePublishStateCallback;

import android.telephony.ims.feature.RcsFeature.RcsImsCapabilities;

import android.util.LocalLog;

import android.util.Log;



import com.android.ims.RcsFeatureManager;

import com.android.ims.rcs.uce.UceController.UceControllerCallback;

import com.android.ims.rcs.uce.util.UceUtils;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;



import java.io.PrintWriter;

import java.lang.ref.WeakReference;

import java.time.Instant;

import java.util.HashMap;
@@ -70,6 +73,7 @@ public class PublishControllerImpl implements PublishController { 


    private final int mSubId;

    private final Context mContext;

    private final LocalLog mLocalLog = new LocalLog(UceUtils.LOG_SIZE);

    private PublishHandler mPublishHandler;

    private volatile boolean mIsDestroyedFlag;

    private volatile boolean mCapabilityPresenceEnabled;
@@ -630,14 +634,17 @@ public class PublishControllerImpl implements PublishController { 


    private void logd(String log) {

        Log.d(LOG_TAG, getLogPrefix().append(log).toString());

        mLocalLog.log("[D] " + log);

    }



    private void logi(String log) {

        Log.i(LOG_TAG, getLogPrefix().append(log).toString());

        mLocalLog.log("[I] " + log);

    }



    private void logw(String log) {

        Log.w(LOG_TAG, getLogPrefix().append(log).toString());

        mLocalLog.log("[W] " + log);

    }



    private StringBuilder getLogPrefix() {
@@ -646,4 +653,32 @@ public class PublishControllerImpl implements PublishController { 
        builder.append("] ");

        return builder;

    }



    @Override

    public void dump(PrintWriter printWriter) {

        IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, "  ");

        pw.println("PublishControllerImpl" + "[subId: " + mSubId + "]:");

        pw.increaseIndent();



        pw.print("mCapabilityPresenceEnabled=");

        pw.println(mCapabilityPresenceEnabled);

        pw.print("mPublishState=");

        pw.print(mPublishState);

        pw.print(" at time ");

        pw.println(mPublishStateUpdatedTime);



        if (mPublishProcessor != null) {

            mPublishProcessor.dump(pw);

        } else {

            pw.println("mPublishProcessor is null");

        }



        pw.println("Log:");

        pw.increaseIndent();

        mLocalLog.dump(pw);

        pw.decreaseIndent();

        pw.println("---");



        pw.decreaseIndent();

    }

}

src/java/com/android/ims/rcs/uce/presence/publish/PublishProcessor.java

+20 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.ims.rcs.uce.presence.publish.PublishController.PublishControl 
import com.android.ims.rcs.uce.presence.publish.PublishController.PublishTriggerType;

import com.android.ims.rcs.uce.util.UceUtils;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;



import java.io.PrintWriter;

import java.time.Instant;
@@ -60,7 +61,7 @@ public class PublishProcessor { 
    // The callback of the PublishController

    private PublishControllerCallback mPublishCtrlCallback;



    private final LocalLog mLocalLog = new LocalLog(20);

    private final LocalLog mLocalLog = new LocalLog(UceUtils.LOG_SIZE);



    public PublishProcessor(Context context, int subId, DeviceCapabilityInfo capabilityInfo,

            PublishControllerCallback publishCtrlCallback) {
@@ -409,6 +410,23 @@ public class PublishProcessor { 
    }



    public void dump(PrintWriter printWriter) {

        mLocalLog.dump(printWriter);

        IndentingPrintWriter pw = new IndentingPrintWriter(printWriter, "  ");

        pw.println("PublishProcessor" + "[subId: " + mSubId + "]:");

        pw.increaseIndent();



        pw.print("ProcessorState: isPublishing=");

        pw.print(mProcessorState.isPublishingNow());

        pw.print(", hasReachedMaxRetries=");

        pw.print(mProcessorState.isReachMaximumRetries());

        pw.print(", delayTimeToAllowPublish=");

        pw.println(mProcessorState.getDelayTimeToAllowPublish());



        pw.println("Log:");

        pw.increaseIndent();

        mLocalLog.dump(pw);

        pw.decreaseIndent();

        pw.println("---");



        pw.decreaseIndent();

    }

}

src/java/com/android/ims/rcs/uce/util/UceUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.telephony.Rlog; 


public class UceUtils {



    public static final int LOG_SIZE = 20;

    private static final String LOG_PREFIX = "RcsUce.";

    private static final String LOG_TAG = LOG_PREFIX + "UceUtils";