Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not print extras in IMM/IMS dump."

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-26 11:05:34 +00:00
committed by Android (Google) Code Review
parent 9fc09b0fbd d71b5fbe49
commit fb500ebb69
4 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/inputmethodservice/InputMethodService.java
View File

@@ -3792,7 +3792,7 @@ public class InputMethodService extends AbstractInputMethodService {
if (mInputEditorInfo != null) {
p.println(" mInputEditorInfo:");
mInputEditorInfo.dump(p, " ");
mInputEditorInfo.dump(p, " ", false /* dumpExtras */);
} else {
p.println(" mInputEditorInfo: null");
}

9
core/java/android/view/inputmethod/EditorInfo.java
View File

@@ -960,6 +960,11 @@ public class EditorInfo implements InputType, Parcelable {
* Write debug output of this object.
*/
public void dump(Printer pw, String prefix) {
dump(pw, prefix, true /* dumpExtras */);
}
/** @hide */
public void dump(Printer pw, String prefix, boolean dumpExtras) {
pw.println(prefix + "inputType=0x" + Integer.toHexString(inputType)
+ " imeOptions=0x" + Integer.toHexString(imeOptions)
+ " privateImeOptions=" + privateImeOptions);
@@ -975,7 +980,9 @@ public class EditorInfo implements InputType, Parcelable {
+ " autofillId=" + autofillId
+ " fieldId=" + fieldId
+ " fieldName=" + fieldName);
pw.println(prefix + "extras=" + extras);
if (dumpExtras) {
pw.println(prefix + "extras=" + extras);
}
pw.println(prefix + "hintLocales=" + hintLocales);
pw.println(prefix + "contentMimeTypes=" + Arrays.toString(contentMimeTypes));
if (targetInputMethodUser != null) {

2
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -3608,7 +3608,7 @@ public final class InputMethodManager {
p.println(" mServedConnecting=" + mServedConnecting);
if (mCurrentTextBoxAttribute != null) {
p.println(" mCurrentTextBoxAttribute:");
mCurrentTextBoxAttribute.dump(p, " ");
mCurrentTextBoxAttribute.dump(p, " ", false /* dumpExtras */);
} else {
p.println(" mCurrentTextBoxAttribute: null");
}

77
core/tests/coretests/src/android/view/inputmethod/EditorInfoTest.java
View File

@@ -16,6 +16,8 @@
package android.view.inputmethod;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,14 +28,20 @@ import static org.mockito.ArgumentMatchers.anyInt;
import android.annotation.Nullable;
import android.graphics.BlurMaskFilter;
import android.os.Bundle;
import android.os.LocaleList;
import android.os.Parcel;
import android.os.UserHandle;
import android.platform.test.annotations.Presubmit;
import android.text.InputType;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.MaskFilterSpan;
import android.text.style.UnderlineSpan;
import android.util.StringBuilderPrinter;
import android.view.autofill.AutofillId;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
@@ -44,6 +52,7 @@ import org.junit.runner.RunWith;
/**
* Supplemental tests that cannot be covered by CTS (e.g. due to hidden API dependencies).
*/
@Presubmit
@SmallTest
@RunWith(AndroidJUnit4.class)
public class EditorInfoTest {
@@ -449,4 +458,72 @@ public class EditorInfoTest {
}
return builder;
}
@Test
public void testDump_empty() {
final EditorInfo info = new EditorInfo();
final StringBuilder sb = new StringBuilder();
info.dump(new StringBuilderPrinter(sb), "prefix: ");
assertThat(sb.toString()).isEqualTo(
"prefix: inputType=0x0 imeOptions=0x0 privateImeOptions=null\n"
+ "prefix: actionLabel=null actionId=0\n"
+ "prefix: initialSelStart=-1 initialSelEnd=-1 initialCapsMode=0x0\n"
+ "prefix: hintText=null label=null\n"
+ "prefix: packageName=null autofillId=null fieldId=0 fieldName=null\n"
+ "prefix: extras=null\n"
+ "prefix: hintLocales=null\n"
+ "prefix: contentMimeTypes=null\n");
}
@Test
public void testDump_filled() {
final EditorInfo info = new EditorInfo();
info.inputType = InputType.TYPE_CLASS_TEXT; // 0x1
info.imeOptions = EditorInfo.IME_ACTION_GO; // 0x2
info.privateImeOptions = "testOptions";
info.initialSelStart = 0;
info.initialSelEnd = 1;
info.initialCapsMode = TextUtils.CAP_MODE_CHARACTERS; // 0x1000
info.hintText = "testHintText";
info.label = "testLabel";
info.packageName = "android.view.inputmethod";
info.autofillId = new AutofillId(123);
info.fieldId = 456;
info.fieldName = "testField";
info.extras = new Bundle();
info.extras.putString("testKey", "testValue");
info.hintLocales = LocaleList.forLanguageTags("en,es,zh");
info.contentMimeTypes = new String[] {"image/png"};
info.targetInputMethodUser = UserHandle.of(10);
final StringBuilder sb = new StringBuilder();
info.dump(new StringBuilderPrinter(sb), "prefix2: ");
assertThat(sb.toString()).isEqualTo(
"prefix2: inputType=0x1 imeOptions=0x2 privateImeOptions=testOptions\n"
+ "prefix2: actionLabel=null actionId=0\n"
+ "prefix2: initialSelStart=0 initialSelEnd=1 initialCapsMode=0x1000\n"
+ "prefix2: hintText=testHintText label=testLabel\n"
+ "prefix2: packageName=android.view.inputmethod autofillId=123"
+ " fieldId=456 fieldName=testField\n"
+ "prefix2: extras=Bundle[{testKey=testValue}]\n"
+ "prefix2: hintLocales=[en,es,zh]\n"
+ "prefix2: contentMimeTypes=[image/png]\n"
+ "prefix2: targetInputMethodUserId=10\n");
}
@Test
public void testDump_noDumpExtras() {
final EditorInfo info = new EditorInfo();
info.extras = new Bundle();
info.extras.putString("testKey", "testValue");
final StringBuilder sb = new StringBuilder();
info.dump(new StringBuilderPrinter(sb), "prefix: ", false /* dumpExtras */);
assertThat(sb.toString()).isEqualTo(
"prefix: inputType=0x0 imeOptions=0x0 privateImeOptions=null\n"
+ "prefix: actionLabel=null actionId=0\n"
+ "prefix: initialSelStart=-1 initialSelEnd=-1 initialCapsMode=0x0\n"
+ "prefix: hintText=null label=null\n"
+ "prefix: packageName=null autofillId=null fieldId=0 fieldName=null\n"
+ "prefix: hintLocales=null\n"
+ "prefix: contentMimeTypes=null\n");
}
}