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

Merge "Merge "Fix strictMode violation in Accesibility Service" into sc-v2-dev am: f8a72564cf" into sc-v2-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2021-07-01 13:35:00 +00:00
committed by Android (Google) Code Review
parent 307285e511 3046951d93
commit 2cdb2f998f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -2074,6 +2074,10 @@ public abstract class AccessibilityService extends Service {
if (WINDOW_SERVICE.equals(name)) {
if (mWindowManager == null) {
mWindowManager = (WindowManager) getBaseContext().getSystemService(name);
final WindowManagerImpl wm = (WindowManagerImpl) mWindowManager;
// Set e default token obtained from the connection to ensure client could use
// accessibility overlay.
wm.setDefaultToken(mWindowToken);
}
return mWindowManager;
}
@@ -2182,8 +2186,10 @@ public abstract class AccessibilityService extends Service {
// The client may have already obtained the window manager, so
// update the default token on whatever manager we gave them.
final WindowManagerImpl wm = (WindowManagerImpl) getSystemService(WINDOW_SERVICE);
wm.setDefaultToken(windowToken);
if (mWindowManager != null) {
final WindowManagerImpl wm = (WindowManagerImpl) mWindowManager;
wm.setDefaultToken(mWindowToken);
}
}
@Override