Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52e910e0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22466478



Change-Id: I75cee9e4f8cd0294d42e86404a67eb98ce04f6a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34644b37 d7731148

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

    }



    /**