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

Commit d69deffd authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

Only register listeners if setView was success. 

Found a memory leak on ViewRootImpl. If the view wasn't been set
to the VRI successfully, there would keep the registed listeners to the
AccessibilityManager and DisplayManager forever because there didn't
need to deatch anything from window.
Another reasonable way is to register all listeners after setView
success.

Bug: 200843755
Test: manual, hard code to force addWindow fail and monitor no more
ViewRootImpl object leaked to AccessibilityManager and DisplayManager.

Change-Id: I3c9cc52d0ca4595c74c1dc3c51d286d9e6e3897f
Merged-In: I3c9cc52d0ca4595c74c1dc3c51d286d9e6e3897f
parent c3af8564

core/java/android/view/ViewRootImpl.java

+24 −12
Original line number Diff line number Diff line
@@ -800,11 +800,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;
@@ -1004,8 +1000,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);
@@ -1198,6 +1192,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;

                }
@@ -1254,6 +1249,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) {
@@ -4979,10 +4996,6 @@ public final class ViewRootImpl implements ViewParent, 
        }



        mAccessibilityInteractionConnectionManager.ensureNoConnection();

        mAccessibilityManager.removeAccessibilityStateChangeListener(

                mAccessibilityInteractionConnectionManager);

        mAccessibilityManager.removeHighTextContrastStateChangeListener(

                mHighContrastTextManager);

        removeSendWindowContentChangedCallback();



        destroyHardwareRenderer();
@@ -5015,8 +5028,7 @@ public final class ViewRootImpl implements ViewParent, 
            mInputEventReceiver = null;

        }



        mDisplayManager.unregisterDisplayListener(mDisplayListener);



        unregisterListeners();

        unscheduleTraversals();

    }