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

Commit 1b7d6105 authored by Govinda Wasserman's avatar Govinda Wasserman
Browse files

Fixes NavigationBarFragment leak 

NavigationBarFragment was leaking because it was never unregistered from
DeviceConfig. This change moves registration to onCreate and unregisters
in onDestroy.

Test: Tested locally
BUG:149091382
Change-Id: Idcf1762d880d706e07fb3ca0e93a0065736239b3
FIX:149091382
parent 60437399

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java

+20 −15
Original line number Diff line number Diff line
@@ -269,6 +269,17 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }

    };



    private final DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener =

            new DeviceConfig.OnPropertiesChangedListener() {

        @Override

        public void onPropertiesChanged(DeviceConfig.Properties properties) {

            if (properties.getKeyset().contains(NAV_BAR_HANDLE_FORCE_OPAQUE)) {

                mForceNavBarHandleOpaque = properties.getBoolean(

                        NAV_BAR_HANDLE_FORCE_OPAQUE, /* defaultValue = */ true);

            }

        }

    };



    @Inject

    public NavigationBarFragment(AccessibilityManagerWrapper accessibilityManagerWrapper,

            DeviceProvisionedController deviceProvisionedController, MetricsLogger metricsLogger,
@@ -298,21 +309,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mDivider = divider;

        mRecentsOptional = recentsOptional;

        mHandler = mainHandler;



        mForceNavBarHandleOpaque = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                NAV_BAR_HANDLE_FORCE_OPAQUE,

                /* defaultValue = */ true);

        DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post,

                new DeviceConfig.OnPropertiesChangedListener() {

                    @Override

                    public void onPropertiesChanged(DeviceConfig.Properties properties) {

                        if (properties.getKeyset().contains(NAV_BAR_HANDLE_FORCE_OPAQUE)) {

                            mForceNavBarHandleOpaque = properties.getBoolean(

                                    NAV_BAR_HANDLE_FORCE_OPAQUE, /* defaultValue = */ true);

                        }

                    }

                });

    }



    // ----- Fragment Lifecycle Callbacks -----
@@ -338,6 +334,13 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 


        // Respect the latest disabled-flags.

        mCommandQueue.recomputeDisableFlags(mDisplayId, false);



        mForceNavBarHandleOpaque = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI,

                NAV_BAR_HANDLE_FORCE_OPAQUE,

                /* defaultValue = */ true);

        DeviceConfig.addOnPropertiesChangedListener(

                DeviceConfig.NAMESPACE_SYSTEMUI, mHandler::post, mOnPropertiesChangedListener);

    }



    @Override
@@ -346,6 +349,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        mNavigationModeController.removeListener(this);

        mAccessibilityManagerWrapper.removeCallback(mAccessibilityListener);

        mContentResolver.unregisterContentObserver(mAssistContentObserver);



        DeviceConfig.removeOnPropertiesChangedListener(mOnPropertiesChangedListener);

    }



    @Override