Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9498153dfd

Change-Id: I5ff7a8c6e5130c6e5c38cfb181c17a2093eef5a3
This commit is contained in:
Sara Kato
2019-04-22 19:17:05 -07:00
committed by android-build-merger
parent 28b2b70180 9498153dfd
commit ddd0ab8333
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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();
}

2
core/java/android/view/accessibility/AccessibilityManager.java
View File

@@ -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;
}

2
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -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");