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

Commit ddd0ab83 authored Apr 22, 2019 by Sara Kato Committed by android-build-merger Apr 22, 2019

Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev

am: 9498153d

Change-Id: I5ff7a8c6e5130c6e5c38cfb181c17a2093eef5a3

parents 28b2b701 9498153d

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -9479,7 +9479,7 @@ package android.view {
		package android.view.accessibility {

		public final class AccessibilityManager {
		method public int getAccessibilityWindowId(android.os.IBinder);
		method public int getAccessibilityWindowId(@Nullable android.os.IBinder);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public void performAccessibilityShortcut();
		}

core/java/android/view/accessibility/AccessibilityManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1015,7 +1015,7 @@ public final class AccessibilityManager {
		* @hide
		*/
		@SystemApi
		public int getAccessibilityWindowId(IBinder windowToken) {
		public int getAccessibilityWindowId(@Nullable IBinder windowToken) {
		if (windowToken == null) {
		return AccessibilityWindowInfo.UNDEFINED_WINDOW_ID;
		}

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2504,7 +2504,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		* registered.
		*/
		@Override
		public int getAccessibilityWindowId(IBinder windowToken) {
		public int getAccessibilityWindowId(@Nullable IBinder windowToken) {
		synchronized (mLock) {
		if (UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) {
		throw new SecurityException("Only SYSTEM can call getAccessibilityWindowId");