Merge "Only register listeners if setView was success." into sc-v2-dev (e9ca4099) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+24 −12

Original line number	Diff line number	Diff line
		@@ -820,11 +820,7 @@ public final class ViewRootImpl implements ViewParent,
		context);
		mCompatibleVisibilityInfo = new SystemUiVisibilityInfo();
		mAccessibilityManager = AccessibilityManager.getInstance(context);
		mAccessibilityManager.addAccessibilityStateChangeListener(
		mAccessibilityInteractionConnectionManager, mHandler);
		mHighContrastTextManager = new HighContrastTextManager();
		mAccessibilityManager.addHighTextContrastStateChangeListener(
		mHighContrastTextManager, mHandler);
		mViewConfiguration = ViewConfiguration.get(context);
		mDensity = context.getResources().getDisplayMetrics().densityDpi;
		mNoncompatDensity = context.getResources().getDisplayMetrics().noncompatDensityDpi;
		@@ -1024,8 +1020,6 @@ public final class ViewRootImpl implements ViewParent,
		mView = view;

		mAttachInfo.mDisplayState = mDisplay.getState();
		mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);

		mViewLayoutDirectionInitial = mView.getRawLayoutDirection();
		mFallbackEventHandler.setView(view);
		mWindowAttributes.copyFrom(attrs);
		@@ -1218,6 +1212,7 @@ public final class ViewRootImpl implements ViewParent,
		"Unable to add window -- unknown error code " + res);
		}

		registerListeners();
		if ((res & WindowManagerGlobal.ADD_FLAG_USE_BLAST) != 0) {
		mUseBLASTAdapter = true;
		}
		@@ -1274,6 +1269,28 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		/**
		* Register any kind of listeners if setView was success.
		*/
		private void registerListeners() {
		mAccessibilityManager.addAccessibilityStateChangeListener(
		mAccessibilityInteractionConnectionManager, mHandler);
		mAccessibilityManager.addHighTextContrastStateChangeListener(
		mHighContrastTextManager, mHandler);
		mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
		}

		/**
		* Unregister all listeners while detachedFromWindow.
		*/
		private void unregisterListeners() {
		mAccessibilityManager.removeAccessibilityStateChangeListener(
		mAccessibilityInteractionConnectionManager);
		mAccessibilityManager.removeHighTextContrastStateChangeListener(
		mHighContrastTextManager);
		mDisplayManager.unregisterDisplayListener(mDisplayListener);
		}

		private void setTag() {
		final String[] split = mWindowAttributes.getTitle().toString().split("\\.");
		if (split.length > 0) {
		@@ -5016,10 +5033,6 @@ public final class ViewRootImpl implements ViewParent,
		}

		mAccessibilityInteractionConnectionManager.ensureNoConnection();
		mAccessibilityManager.removeAccessibilityStateChangeListener(
		mAccessibilityInteractionConnectionManager);
		mAccessibilityManager.removeHighTextContrastStateChangeListener(
		mHighContrastTextManager);
		removeSendWindowContentChangedCallback();

		destroyHardwareRenderer();
		@@ -5052,8 +5065,7 @@ public final class ViewRootImpl implements ViewParent,
		mInputEventReceiver = null;
		}

		mDisplayManager.unregisterDisplayListener(mDisplayListener);

		unregisterListeners();
		unscheduleTraversals();
		}