From 0fdbae3c46a0bc8ba41d6c5b01d8bb76df1b0f62 Mon Sep 17 00:00:00 2001 From: Sara Kato Date: Tue, 19 Mar 2019 03:22:31 +0900 Subject: [PATCH] Add @Nullable annotation to getAccessibilityWindowId Bug: 126701062 Test: None Change-Id: I7d13d56f5ffb303431f7e82418134d6f17275ef5 --- api/system-current.txt | 2 +- core/java/android/view/accessibility/AccessibilityManager.java | 2 +- .../server/accessibility/AccessibilityManagerService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index d08039d81dab4..99779de09e3d2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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(); } diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java index d12777fe908ef..882e6fd8e3285 100644 --- a/core/java/android/view/accessibility/AccessibilityManager.java +++ b/core/java/android/view/accessibility/AccessibilityManager.java @@ -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; } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 6e2c2280a8b9a..334262fa35700 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -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");