From 895c8e56db00c9f203f84491ed78e69a5fae86d2 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Wed, 5 Apr 2023 00:47:09 +0000
Subject: [PATCH] Fixed AccessibilityServiceInfo.getId()

It was throwing a NPE when the component was not set.

Test: atest android.accessibilityservice.cts.AccessibilityServiceInfoTest

Bug: 271166949
Bug: 271188189

Change-Id: I1755082ff40a9fe037084100ced9286639ffc101
---
 .../accessibilityservice/AccessibilityServiceInfo.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
index 6dcf33114b197..808f25eb7cd9c 100644
--- 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();
     }
 
     /**