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

Commit 493e992a authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Potential fix for NPE in AccessibilitySettings."

parents d57df230 1b52e0d0

src/com/android/settings/AccessibilitySettings.java

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
    }



    public void removeToggleAccessibilitySwitch() {

        mToggleAccessibilitySwitch.setOnBeforeCheckedChangeListener(null);

        getActivity().getActionBar().setCustomView(null);

    }
@@ -778,6 +779,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            if (mOldActivityTitle != null) {

                getActivity().getActionBar().setTitle(mOldActivityTitle);

            }

            mToggleSwitch.setOnBeforeCheckedChangeListener(null);

            super.onDestroyView();

        }