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

Commit 5093019f authored by Phil Weaver's avatar Phil Weaver Committed by Rhed Jao
Browse files

SecurityPolicy refactor 

Bug: 112046331
Test: a11y cts and framework tests
Test: atest AccessibilitySecurityPolicyTest
Test: atest AccessibilityWindowManagerTest
Change-Id: I86c68603588b94cbd312e2ea30202ce866f99953
parent ba1ac591

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

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ interface IAccessibilityManager { 
    void temporaryEnableAccessibilityStateUntilKeyguardRemoved(in ComponentName service,

            boolean touchExplorationEnabled);



    // Used by UiAutomation

    IBinder getWindowToken(int windowId, int userId);



    void notifyAccessibilityButtonClicked(int displayId);

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

+194 −91

File changed.

Preview size limit exceeded, changes collapsed.

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

+47 −1359

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+533 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+3 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.util.Slog;



import com.android.server.accessibility.AccessibilityManagerService.SecurityPolicy;

import com.android.server.accessibility.AccessibilityManagerService.UserState;

import com.android.server.wm.WindowManagerInternal;
@@ -67,11 +66,11 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect 
    public AccessibilityServiceConnection(UserState userState, Context context,

            ComponentName componentName,

            AccessibilityServiceInfo accessibilityServiceInfo, int id, Handler mainHandler,

            Object lock, SecurityPolicy securityPolicy, SystemSupport systemSupport,

            Object lock, AccessibilitySecurityPolicy securityPolicy, SystemSupport systemSupport,

            WindowManagerInternal windowManagerInternal,

            GlobalActionPerformer globalActionPerfomer) {

            GlobalActionPerformer globalActionPerfomer, AccessibilityWindowManager awm) {

        super(context, componentName, accessibilityServiceInfo, id, mainHandler, lock,

                securityPolicy, systemSupport, windowManagerInternal, globalActionPerfomer);

                securityPolicy, systemSupport, windowManagerInternal, globalActionPerfomer, awm);

        mUserStateWeakReference = new WeakReference<UserState>(userState);

        mIntent = new Intent().setComponent(mComponentName);

        mMainHandler = mainHandler;