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

Commit 95885d60 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused destroy methods"

parents 00aa3faa b4d9ded4

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+0 −24
Original line number Diff line number Diff line
@@ -221,30 +221,6 @@ public class CarStatusBar extends StatusBar implements 
        }

    }



    @Override

    public void destroy() {

        mCarBatteryController.stopListening();

        mConnectedDeviceSignalController.stopListening();

        mActivityManagerWrapper.unregisterTaskStackListener(mTaskStackListener);

        mDrivingStateHelper.disconnectFromCarService();



        if (mNavigationBarWindow != null) {

            mWindowManager.removeViewImmediate(mNavigationBarWindow);

            mNavigationBarView = null;

        }



        if (mLeftNavigationBarWindow != null) {

            mWindowManager.removeViewImmediate(mLeftNavigationBarWindow);

            mLeftNavigationBarView = null;

        }



        if (mRightNavigationBarWindow != null) {

            mWindowManager.removeViewImmediate(mRightNavigationBarWindow);

            mRightNavigationBarView = null;

        }

        super.destroy();

    }





    @Override

    protected void makeStatusBarView() {

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+0 −4
Original line number Diff line number Diff line
@@ -290,10 +290,6 @@ public class AssistManager implements ConfigurationChangedReceiver { 
        return mAssistUtils.isSessionRunning();

    }



    public void destroy() {

        mWindowManager.removeViewImmediate(mView);

    }



    private void maybeSwapSearchIcon(@NonNull ComponentName assistComponent, boolean isService) {

        replaceDrawable(mView.getOrb().getLogo(), assistComponent, ASSIST_ICON_METADATA_NAME,

                isService);

packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarController.java

+0 −12
Original line number Diff line number Diff line
@@ -158,18 +158,6 @@ public class NavigationBarController implements DisplayListener, Callbacks { 
        });

    }



    /** Removes navigation bars. */

    public void destroy() {

        mDisplayManager.unregisterDisplayListener(this);

        if (mNavigationBars.size() > 0) {

            for (int i = 0; i < mNavigationBars.size(); i++) {

                int displayId = mNavigationBars.keyAt(i);

                removeNavigationBar(displayId);

            }

            mNavigationBars.clear();

        }

    }



    private void removeNavigationBar(int displayId) {

        NavigationBarFragment navBar = mNavigationBars.get(displayId);

        if (navBar != null) {

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManager.java

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ public interface NotificationLockscreenUserManager { 
    /** Adds a listener to be notified when the current user changes. */

    void addUserChangedListener(UserChangedListener listener);



    void destroy();



    SparseArray<UserInfo> getCurrentProfiles();



    void setLockscreenPublicMode(boolean isProfilePublic, int userId);

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

+0 −6
Original line number Diff line number Diff line
@@ -550,12 +550,6 @@ public class NotificationLockscreenUserManagerImpl implements 
        return mKeyguardMonitor.isSecure() || mLockPatternUtils.isSecure(userId);

    }



    public void destroy() {

        mContext.unregisterReceiver(mBaseBroadcastReceiver);

        mContext.unregisterReceiver(mAllUsersReceiver);

        mListeners.clear();

    }



    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.println("NotificationLockscreenUserManager state:");