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

Commit 02fb8569 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the memory leak caused by the accessibility menu in SystemUI" into main am: 4f490c58 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3016461



Change-Id: Ibbcb722fe1fae525b7fc01fae75599fd636a72a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3261a8e 4f490c58

packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/AccessibilityMenuService.java

+4 −0
Original line number Diff line number Diff line
@@ -387,6 +387,10 @@ public class AccessibilityMenuService extends AccessibilityService 
        unregisterReceiver(mToggleMenuReceiver);

        mPrefs.unregisterOnSharedPreferenceChangeListener(mSharedPreferenceChangeListener);

        sInitialized = false;

        if (mA11yMenuLayout != null) {

            mA11yMenuLayout.clearLayout();

            mA11yMenuLayout = null;

        }

        return super.onUnbind(intent);

    }

packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java

+8 −0
Original line number Diff line number Diff line
@@ -151,6 +151,14 @@ public class A11yMenuOverlayLayout { 
        return mLayout;

    }



    public void clearLayout() {

        if (mLayout != null) {

            mWindowManager.removeView(mLayout);

            mLayout.setOnTouchListener(null);

            mLayout = null;

        }

    }



    /** Updates view layout with new layout parameters only. */

    public void updateViewLayout() {

        if (mLayout == null || mLayoutParameter == null) {