Merge "Include textclassifier info in dumpsys"
diff --git a/core/java/android/view/textclassifier/SystemTextClassifier.java b/core/java/android/view/textclassifier/SystemTextClassifier.java
index 10191e0..16eb5af 100644
--- a/core/java/android/view/textclassifier/SystemTextClassifier.java
+++ b/core/java/android/view/textclassifier/SystemTextClassifier.java
@@ -30,6 +30,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.annotations.VisibleForTesting.Visibility;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import java.util.concurrent.CountDownLatch;
@@ -162,6 +163,17 @@
}
}
+ @Override
+ public void dump(@NonNull IndentingPrintWriter printWriter) {
+ printWriter.println("SystemTextClassifier:");
+ printWriter.increaseIndent();
+ printWriter.printPair("mFallback", mFallback);
+ printWriter.printPair("mPackageName", mPackageName);
+ printWriter.printPair("mSessionId", mSessionId);
+ printWriter.decreaseIndent();
+ printWriter.println();
+ }
+
/**
* Attempts to initialize a new classification session.
*
diff --git a/core/java/android/view/textclassifier/TextClassificationConstants.java b/core/java/android/view/textclassifier/TextClassificationConstants.java
index 21b5603..2fc7422 100644
--- a/core/java/android/view/textclassifier/TextClassificationConstants.java
+++ b/core/java/android/view/textclassifier/TextClassificationConstants.java
@@ -20,6 +20,8 @@
import android.util.KeyValueListParser;
import android.util.Slog;
+import com.android.internal.util.IndentingPrintWriter;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -241,4 +243,25 @@
private static List<String> parseEntityList(String listStr) {
return Collections.unmodifiableList(Arrays.asList(listStr.split(ENTITY_LIST_DELIMITER)));
}
+
+ void dump(IndentingPrintWriter pw) {
+ pw.println("TextClassificationConstants:");
+ pw.increaseIndent();
+ pw.printPair("isLocalTextClassifierEnabled", mLocalTextClassifierEnabled);
+ pw.printPair("isSystemTextClassifierEnabled", mSystemTextClassifierEnabled);
+ pw.printPair("isModelDarkLaunchEnabled", mModelDarkLaunchEnabled);
+ pw.printPair("isSmartSelectionEnabled", mSmartSelectionEnabled);
+ pw.printPair("isSmartTextShareEnabled", mSmartTextShareEnabled);
+ pw.printPair("isSmartLinkifyEnabled", mSmartLinkifyEnabled);
+ pw.printPair("isSmartSelectionAnimationEnabled", mSmartSelectionAnimationEnabled);
+ pw.printPair("getSuggestSelectionMaxRangeLength", mSuggestSelectionMaxRangeLength);
+ pw.printPair("getClassifyTextMaxRangeLength", mClassifyTextMaxRangeLength);
+ pw.printPair("getGenerateLinksMaxTextLength", mGenerateLinksMaxTextLength);
+ pw.printPair("getGenerateLinksLogSampleRate", mGenerateLinksLogSampleRate);
+ pw.printPair("getEntityListDefault", mEntityListDefault);
+ pw.printPair("getEntityListNotEditable", mEntityListNotEditable);
+ pw.printPair("getEntityListEditable", mEntityListEditable);
+ pw.decreaseIndent();
+ pw.println();
+ }
}
diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java
index dc1194b..201218ba 100644
--- a/core/java/android/view/textclassifier/TextClassificationManager.java
+++ b/core/java/android/view/textclassifier/TextClassificationManager.java
@@ -27,6 +27,7 @@
import android.view.textclassifier.TextClassifier.TextClassifierType;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import java.lang.ref.WeakReference;
@@ -246,6 +247,13 @@
: mContext;
}
+ /** @hide **/
+ public void dump(IndentingPrintWriter pw) {
+ getLocalTextClassifier().dump(pw);
+ getSystemTextClassifier().dump(pw);
+ getSettings().dump(pw);
+ }
+
/** @hide */
public static TextClassificationConstants getSettings(Context context) {
Preconditions.checkNotNull(context);
diff --git a/core/java/android/view/textclassifier/TextClassifier.java b/core/java/android/view/textclassifier/TextClassifier.java
index 24f531d..1505863 100644
--- a/core/java/android/view/textclassifier/TextClassifier.java
+++ b/core/java/android/view/textclassifier/TextClassifier.java
@@ -34,6 +34,7 @@
import android.util.ArrayMap;
import android.util.ArraySet;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import java.lang.annotation.Retention;
@@ -390,6 +391,11 @@
return false;
}
+ /** @hide **/
+ default void dump(@NonNull IndentingPrintWriter printWriter) {
+
+ }
+
/**
* Configuration object for specifying what entities to identify.
*
diff --git a/core/java/android/view/textclassifier/TextClassifierImpl.java b/core/java/android/view/textclassifier/TextClassifierImpl.java
index 6e5751a..29339e9 100644
--- a/core/java/android/view/textclassifier/TextClassifierImpl.java
+++ b/core/java/android/view/textclassifier/TextClassifierImpl.java
@@ -41,6 +41,7 @@
import android.provider.ContactsContract;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import java.io.File;
@@ -439,6 +440,24 @@
return builder.setId(createId(text, start, end)).build();
}
+ @Override
+ public void dump(@NonNull IndentingPrintWriter printWriter) {
+ synchronized (mLock) {
+ listAllModelsLocked();
+ printWriter.println("TextClassifierImpl:");
+ printWriter.increaseIndent();
+ printWriter.println("Model file(s):");
+ printWriter.increaseIndent();
+ for (ModelFile modelFile : mAllModelFiles) {
+ printWriter.println(modelFile.toString());
+ }
+ printWriter.decreaseIndent();
+ printWriter.printPair("mFallback", mFallback);
+ printWriter.decreaseIndent();
+ printWriter.println();
+ }
+ }
+
/**
* Closes the ParcelFileDescriptor and logs any errors that occur.
*/
diff --git a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
index 2742b0f..005212f 100644
--- a/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
+++ b/services/core/java/com/android/server/textclassifier/TextClassificationManagerService.java
@@ -28,6 +28,7 @@
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;
@@ -38,16 +39,22 @@
import android.view.textclassifier.SelectionEvent;
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;
import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.DumpUtils;
import com.android.internal.util.FunctionalUtils;
import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
+import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
import com.android.server.SystemService;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
import java.util.ArrayDeque;
import java.util.Queue;
@@ -259,6 +266,14 @@
return mUserStates.get(userId);
}
+ @Override
+ protected void dump(FileDescriptor fd, PrintWriter fout, String[] args) {
+ if (!DumpUtils.checkDumpPermission(mContext, LOG_TAG, fout)) return;
+ IndentingPrintWriter pw = new IndentingPrintWriter(fout, " ");
+ TextClassificationManager tcm = mContext.getSystemService(TextClassificationManager.class);
+ tcm.dump(pw);
+ }
+
private static final class PendingRequest implements IBinder.DeathRecipient {
@Nullable private final IBinder mBinder;