Merge "Revert "Laziliy initialize SystemActionPerformer"" into rvc-dev (1fb728d7) · Commits · e / os / android_frameworks_base

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

+8 −15

Original line number	Original line	Diff line number	Diff line
	@@ -197,8 +197,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub

	private final MainHandler mMainHandler;		private final MainHandler mMainHandler;

	// Lazily initialized - access through getSystemActionPerfomer()		private final SystemActionPerformer mSystemActionPerformer;
	private SystemActionPerformer mSystemActionPerformer;

	private MagnificationController mMagnificationController;		private MagnificationController mMagnificationController;

	@@ -296,6 +295,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	mActivityTaskManagerService = LocalServices.getService(ActivityTaskManagerInternal.class);		mActivityTaskManagerService = LocalServices.getService(ActivityTaskManagerInternal.class);
	mPackageManager = mContext.getPackageManager();		mPackageManager = mContext.getPackageManager();
	mSecurityPolicy = new AccessibilitySecurityPolicy(mContext, this);		mSecurityPolicy = new AccessibilitySecurityPolicy(mContext, this);
			mSystemActionPerformer =
			new SystemActionPerformer(mContext, mWindowManagerService, null, this);
	mA11yWindowManager = new AccessibilityWindowManager(mLock, mMainHandler,		mA11yWindowManager = new AccessibilityWindowManager(mLock, mMainHandler,
	mWindowManagerService, this, mSecurityPolicy, this);		mWindowManagerService, this, mSecurityPolicy, this);
	mA11yDisplayListener = new AccessibilityDisplayListener(mContext, mMainHandler);		mA11yDisplayListener = new AccessibilityDisplayListener(mContext, mMainHandler);
	@@ -671,7 +672,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	mSecurityPolicy.enforceCallerIsRecentsOrHasPermission(		mSecurityPolicy.enforceCallerIsRecentsOrHasPermission(
	Manifest.permission.MANAGE_ACCESSIBILITY,		Manifest.permission.MANAGE_ACCESSIBILITY,
	FUNCTION_REGISTER_SYSTEM_ACTION);		FUNCTION_REGISTER_SYSTEM_ACTION);
	getSystemActionPerformer().registerSystemAction(actionId, action);		mSystemActionPerformer.registerSystemAction(actionId, action);
	}		}

	/**		/**
	@@ -684,15 +685,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	mSecurityPolicy.enforceCallerIsRecentsOrHasPermission(		mSecurityPolicy.enforceCallerIsRecentsOrHasPermission(
	Manifest.permission.MANAGE_ACCESSIBILITY,		Manifest.permission.MANAGE_ACCESSIBILITY,
	FUNCTION_UNREGISTER_SYSTEM_ACTION);		FUNCTION_UNREGISTER_SYSTEM_ACTION);
	getSystemActionPerformer().unregisterSystemAction(actionId);		mSystemActionPerformer.unregisterSystemAction(actionId);
	}

	private SystemActionPerformer getSystemActionPerformer() {
	if (mSystemActionPerformer == null) {
	mSystemActionPerformer =
	new SystemActionPerformer(mContext, mWindowManagerService, null, this);
	}
	return mSystemActionPerformer;
	}		}

	@Override		@Override
	@@ -804,7 +797,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	synchronized (mLock) {		synchronized (mLock) {
	mUiAutomationManager.registerUiTestAutomationServiceLocked(owner, serviceClient,		mUiAutomationManager.registerUiTestAutomationServiceLocked(owner, serviceClient,
	mContext, accessibilityServiceInfo, sIdCounter++, mMainHandler,		mContext, accessibilityServiceInfo, sIdCounter++, mMainHandler,
	mSecurityPolicy, this, mWindowManagerService, getSystemActionPerformer(),		mSecurityPolicy, this, mWindowManagerService, mSystemActionPerformer,
	mA11yWindowManager, flags);		mA11yWindowManager, flags);
	onUserStateChangedLocked(getCurrentUserStateLocked());		onUserStateChangedLocked(getCurrentUserStateLocked());
	}		}
	@@ -1515,7 +1508,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	if (service == null) {		if (service == null) {
	service = new AccessibilityServiceConnection(userState, mContext, componentName,		service = new AccessibilityServiceConnection(userState, mContext, componentName,
	installedService, sIdCounter++, mMainHandler, mLock, mSecurityPolicy,		installedService, sIdCounter++, mMainHandler, mLock, mSecurityPolicy,
	this, mWindowManagerService, getSystemActionPerformer(),		this, mWindowManagerService, mSystemActionPerformer,
	mA11yWindowManager, mActivityTaskManagerService);		mA11yWindowManager, mActivityTaskManagerService);
	} else if (userState.mBoundServices.contains(service)) {		} else if (userState.mBoundServices.contains(service)) {
	continue;		continue;
	@@ -2764,7 +2757,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
	userState, mContext,		userState, mContext,
	COMPONENT_NAME, info, sIdCounter++, mMainHandler, mLock, mSecurityPolicy,		COMPONENT_NAME, info, sIdCounter++, mMainHandler, mLock, mSecurityPolicy,
	AccessibilityManagerService.this, mWindowManagerService,		AccessibilityManagerService.this, mWindowManagerService,
	getSystemActionPerformer(), mA11yWindowManager, mActivityTaskManagerService) {		mSystemActionPerformer, mA11yWindowManager, mActivityTaskManagerService) {
	@Override		@Override
	public boolean supportsFlagForNotImportantViews(AccessibilityServiceInfo info) {		public boolean supportsFlagForNotImportantViews(AccessibilityServiceInfo info) {
	return true;		return true;