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

Commit 50705a43 authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "rhed_SecurityPolicy_refactor" 

* changes:
  Accessibility SecurityPolicy refactor tests
  SecurityPolicy refactor
parents b6828fb9 21a1dbc5

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;