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

Commit 6d27c6d8 authored by Jacky Kao's avatar Jacky Kao Committed by Automerger Merge Worker
Browse files

Merge "Bubble's change could notify to A11y framework" into rvc-dev am: 226aaf6a 

Change-Id: Ib88021870ca01e264f7c32d5a63c106b89dbf7e3
parents 897759cf 226aaf6a

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+15 −1
Original line number Original line Diff line number Diff line
@@ -51,6 +51,7 @@ import android.content.DialogInterface.OnClickListener; 
import android.content.Intent;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.ServiceInfo;

import android.database.ContentObserver;

import android.database.ContentObserver;
@@ -2934,11 +2935,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    public class AccessibilityDisplayListener implements DisplayManager.DisplayListener {

    public class AccessibilityDisplayListener implements DisplayManager.DisplayListener {

        private final DisplayManager mDisplayManager;

        private final DisplayManager mDisplayManager;

        private final ArrayList<Display> mDisplaysList = new ArrayList<>();

        private final ArrayList<Display> mDisplaysList = new ArrayList<>();

        private int mSystemUiUid = 0;





        AccessibilityDisplayListener(Context context, MainHandler handler) {

        AccessibilityDisplayListener(Context context, MainHandler handler) {

            mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);

            mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);

            mDisplayManager.registerDisplayListener(this, handler);

            mDisplayManager.registerDisplayListener(this, handler);

            initializeDisplayList();

            initializeDisplayList();



            final PackageManagerInternal pm =

                    LocalServices.getService(PackageManagerInternal.class);

            if (pm != null) {

                mSystemUiUid = pm.getPackageUid(pm.getSystemUiServiceComponent().getPackageName(),

                        PackageManager.MATCH_SYSTEM_ONLY, mCurrentUserId);

            }

        }

        }





        ArrayList<Display> getValidDisplayList() {

        ArrayList<Display> getValidDisplayList() {
@@ -3034,8 +3043,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            }

            }

            // Private virtual displays are created by the ap and is not allowed to access by other

            // Private virtual displays are created by the ap and is not allowed to access by other

            // aps. We assume we could ignore them.

            // aps. We assume we could ignore them.

            // The exceptional case is for bubbles. Because the bubbles use the activityView, and

            // the virtual display of the activityView is private, so if the owner UID of the

            // private virtual display is the one of system ui which creates the virtual display of

            // bubbles, then this private virtual display should track the windows.

            if (display.getType() == Display.TYPE_VIRTUAL

            if (display.getType() == Display.TYPE_VIRTUAL

                    && (display.getFlags() & Display.FLAG_PRIVATE) != 0) {

                    && (display.getFlags() & Display.FLAG_PRIVATE) != 0

                    && display.getOwnerUid() != mSystemUiUid) {

                return false;

                return false;

            }

            }

            return true;

            return true;