Merge "Fixed AccessibilityServiceInfo.getId()" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d773114830
@@ -860,10 +860,10 @@ public class AccessibilityServiceInfo implements Parcelable {
|
|||||||
* <p>
|
* <p>
|
||||||
* <strong>Generated by the system.</strong>
|
* <strong>Generated by the system.</strong>
|
||||||
* </p>
|
* </p>
|
||||||
* @return The id.
|
* @return The id (or {@code null} if the component is not set yet).
|
||||||
*/
|
*/
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return mComponentName.flattenToShortString();
|
return mComponentName == null ? null : mComponentName.flattenToShortString();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user