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
This commit is contained in:
Sara Kato
2019-04-23 01:28:23 +00:00
committed by Android (Google) Code Review
parent 77e2b7b4ca 0fdbae3c46
commit 9498153dfd
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 { package android.view.accessibility {
public final class AccessibilityManager { 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(); 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 * @hide
*/ */
@SystemApi @SystemApi
public int getAccessibilityWindowId(IBinder windowToken) { public int getAccessibilityWindowId(@Nullable IBinder windowToken) {
if (windowToken == null) { if (windowToken == null) {
return AccessibilityWindowInfo.UNDEFINED_WINDOW_ID; 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. * registered.
*/ */
@Override @Override
public int getAccessibilityWindowId(IBinder windowToken) { public int getAccessibilityWindowId(@Nullable IBinder windowToken) {
synchronized (mLock) { synchronized (mLock) {
if (UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) { if (UserHandle.getAppId(Binder.getCallingUid()) != Process.SYSTEM_UID) {
throw new SecurityException("Only SYSTEM can call getAccessibilityWindowId"); throw new SecurityException("Only SYSTEM can call getAccessibilityWindowId");