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

Commit 20d8945b authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge "(fix) Naming of the method attachAccessibilityOverlayToDisplay" into main

parents 4f76d1e0 a8dd0bc9

core/java/android/view/accessibility/AccessibilityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2424,7 +2424,7 @@ public final class AccessibilityManager { 
            }

        }

        try {

            service.attachAccessibilityOverlayToDisplay_enforcePermission(

            service.attachAccessibilityOverlayToDisplay(

                    displayId, surfaceControl);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

core/java/android/view/accessibility/IAccessibilityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -139,5 +139,5 @@ interface IAccessibilityManager { 
    WindowTransformationSpec getWindowTransformationSpec(int windowId);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.INTERNAL_SYSTEM_WINDOW)")

    void attachAccessibilityOverlayToDisplay_enforcePermission(int displayId, in SurfaceControl surfaceControl);

    void attachAccessibilityOverlayToDisplay(int displayId, in SurfaceControl surfaceControl);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -5725,10 +5725,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
    }



    @Override

    public void attachAccessibilityOverlayToDisplay_enforcePermission(

    public void attachAccessibilityOverlayToDisplay(

            int displayId, SurfaceControl sc) {

        mContext.enforceCallingPermission(

                INTERNAL_SYSTEM_WINDOW, "attachAccessibilityOverlayToDisplay_enforcePermission");

                INTERNAL_SYSTEM_WINDOW, "attachAccessibilityOverlayToDisplay");

        mMainHandler.sendMessage(

                obtainMessage(

                        AccessibilityManagerService::attachAccessibilityOverlayToDisplayInternal,