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

Commit 3046951d authored by Ryan Lin's avatar Ryan Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix strictMode violation in Accesibility Service" into sc-v2-dev am: f8a72564 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15079518

Change-Id: If27990f0fdddf75e42e6ec14f1d98c0b2da5d330
parents 9e4072f0 f8a72564

core/java/android/accessibilityservice/AccessibilityService.java

+8 −2
Original line number Diff line number Diff line
@@ -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