diff options
| author | 2024-02-22 18:30:51 +0000 | |
|---|---|---|
| committer | 2024-02-22 18:30:51 +0000 | |
| commit | 1710ca94d201d6cb2e5b5dd4c2011b2e393efe3f (patch) | |
| tree | 41fc52bc8772869fa1956533e5fb92d4a64ff995 | |
| parent | e56734fb2d9dc72a61018837188f95dfb64a2b7a (diff) | |
| parent | 75c2263ec716788603695ab9037b6636ad9d7687 (diff) | |
Merge "Address nits from ag/25977295" into main
| -rw-r--r-- | core/java/android/app/assist/AssistStructure.java | 8 | ||||
| -rw-r--r-- | core/java/android/credentials/GetCredentialResponse.java | 3 | ||||
| -rw-r--r-- | core/java/android/view/View.java | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java index 1f744935e264..d139134c7c1a 100644 --- a/core/java/android/app/assist/AssistStructure.java +++ b/core/java/android/app/assist/AssistStructure.java @@ -1289,11 +1289,7 @@ public class AssistStructure implements Parcelable { } /** - * - * @return - * * @hide - * */ @FlaggedApi(FLAG_AUTOFILL_CREDMAN_DEV_INTEGRATION) @Nullable @@ -2571,7 +2567,7 @@ public class AssistStructure implements Parcelable { } AutofillId autofillId = node.getAutofillId(); if (autofillId == null) { - Log.i(TAG, prefix + " NO autofill ID"); + Log.i(TAG, prefix + " No autofill ID"); } else { Log.i(TAG, prefix + " Autofill info: id= " + autofillId + ", type=" + node.getAutofillType() @@ -2586,7 +2582,7 @@ public class AssistStructure implements Parcelable { } GetCredentialRequest getCredentialRequest = node.getCredentialManagerRequest(); if (getCredentialRequest == null) { - Log.i(TAG, prefix + " NO Credential Manager Request"); + Log.i(TAG, prefix + " No Credential Manager Request"); } else { Log.i(TAG, prefix + " GetCredentialRequest: no. of options= " + getCredentialRequest.getCredentialOptions().size() diff --git a/core/java/android/credentials/GetCredentialResponse.java b/core/java/android/credentials/GetCredentialResponse.java index ea699b9a74e5..a1477ee1a43a 100644 --- a/core/java/android/credentials/GetCredentialResponse.java +++ b/core/java/android/credentials/GetCredentialResponse.java @@ -63,9 +63,6 @@ public final class GetCredentialResponse implements Parcelable { } /** - * - * @return - * * @hide */ public AutofillId getAutofillId() { diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f7f99ac1ee21..028448ccf871 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -1047,7 +1047,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, @Nullable private ViewCredentialHandler mViewCredentialHandler; - /** Used to avoid computing the full strings each time when layout tracing is enabled. */ @Nullable private ViewTraversalTracingStrings mTracingStrings; |