Merge "Fixed AccessibilityServiceInfo.getId()" into udc-dev

2023-04-05 18:49:10 +00:00
parent cb05df1584 895c8e56db
commit d773114830
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
@@ -860,10 +860,10 @@ public class AccessibilityServiceInfo implements Parcelable {
     * <p>
     *   <strong>Generated by the system.</strong>
     * </p>
-     * @return The id.
+     * @return The id (or {@code null} if the component is not set yet).
     */
    public String getId() {
-        return mComponentName.flattenToShortString();
+        return mComponentName == null ? null : mComponentName.flattenToShortString();
    }

    /**