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

Commit f819213c authored by Felipe Leme's avatar Felipe Leme
Browse files

Improved logging and dump on TextClassification. 

Bug: 117435676
Test: adb shell dumpsys textclassification

Change-Id: I09a7bbebb38117f1be8456a0c31b74a936b1e079
parent 8977bfd6

core/java/android/service/textclassifier/TextClassifierService.java

+2 −2
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ public abstract class TextClassifierService extends Service { 
                PackageManager.MATCH_SYSTEM_ONLY);



        if ((ri == null) || (ri.serviceInfo == null)) {

            Slog.w(LOG_TAG, String.format("Package or service not found in package %s",

                    packageName));

            Slog.w(LOG_TAG, String.format("Package or service not found in package %s for user %d",

                    packageName, context.getUserId()));

            return null;

        }

        final ServiceInfo si = ri.serviceInfo;

services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java

+23 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.service.textclassifier.ITextClassificationCallback;

import android.service.textclassifier.ITextClassifierService;

import android.service.textclassifier.ITextLinksCallback;
@@ -41,7 +40,6 @@ import android.view.textclassifier.TextClassification; 
import android.view.textclassifier.TextClassificationContext;

import android.view.textclassifier.TextClassificationManager;

import android.view.textclassifier.TextClassificationSessionId;

import android.view.textclassifier.TextClassifier;

import android.view.textclassifier.TextLinks;

import android.view.textclassifier.TextSelection;
@@ -275,6 +273,20 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
        IndentingPrintWriter pw = new IndentingPrintWriter(fout, "  ");

        TextClassificationManager tcm = mContext.getSystemService(TextClassificationManager.class);

        tcm.dump(pw);



        pw.printPair("context", mContext); pw.println();

        synchronized (mLock) {

            int size = mUserStates.size();

            pw.print("Number user states: "); pw.println(size);

            if (size > 0) {

                for (int i = 0; i < size; i++) {

                    pw.increaseIndent();

                    UserState userState = mUserStates.valueAt(i);

                    pw.print(i); pw.print(":"); userState.dump(pw); pw.println();

                    pw.decreaseIndent();

                }

            }

        }

    }



    private static final class PendingRequest implements IBinder.DeathRecipient {
@@ -431,6 +443,15 @@ public final class TextClassificationManagerService extends ITextClassifierServi 
            return willBind;

        }



        private void dump(IndentingPrintWriter pw) {

            pw.printPair("context", mContext);

            pw.printPair("userId", mUserId);

            synchronized (mLock) {

                pw.printPair("binding", mBinding);

                pw.printPair("numberRequests", mPendingRequests.size());

            }

        }



        private final class TextClassifierServiceConnection implements ServiceConnection {

            @Override

            public void onServiceConnected(ComponentName name, IBinder service) {