Merge "Fixed AccessibilityServiceInfo.getId()" into udc-dev am: d773114830
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22466478 Change-Id: If170b639865f92418db80a6752485a54f8c9a45b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user