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

Commit 46e63117 authored by Jim Miller's avatar Jim Miller
Browse files

DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService 

This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().

It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.

The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.

Fixes bug 11982048

Change-Id: I6959816b819ba953512c53675162195cbf1e0653
parent a413a4ae

services/java/com/android/server/wm/WindowManagerService.java

+21 −10
Original line number Diff line number Diff line
@@ -437,8 +437,15 @@ public class WindowManagerService extends IWindowManager.Stub 
    int mRotation = 0;

    int mForcedAppOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

    boolean mAltOrientation = false;

    ArrayList<IRotationWatcher> mRotationWatchers

            = new ArrayList<IRotationWatcher>();

    class RotationWatcher {

        IRotationWatcher watcher;

        IBinder.DeathRecipient dr;

        RotationWatcher(IRotationWatcher w, IBinder.DeathRecipient d) {

            watcher = w;

            dr = d;

        }

    }

    ArrayList<RotationWatcher> mRotationWatchers = new ArrayList<RotationWatcher>();

    int mDeferredRotationPauseCount;



    int mSystemDecorLayer = 0;
@@ -5993,7 +6000,7 @@ public class WindowManagerService extends IWindowManager.Stub 


        for (int i=mRotationWatchers.size()-1; i>=0; i--) {

            try {

                mRotationWatchers.get(i).onRotationChanged(rotation);

                mRotationWatchers.get(i).watcher.onRotationChanged(rotation);

            } catch (RemoteException e) {

            }

        }
@@ -6025,10 +6032,10 @@ public class WindowManagerService extends IWindowManager.Stub 
            public void binderDied() {

                synchronized (mWindowMap) {

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

                        if (watcherBinder == mRotationWatchers.get(i).asBinder()) {

                            IRotationWatcher removed = mRotationWatchers.remove(i);

                        if (watcherBinder == mRotationWatchers.get(i).watcher.asBinder()) {

                            RotationWatcher removed = mRotationWatchers.remove(i);

                            if (removed != null) {

                                removed.asBinder().unlinkToDeath(this, 0);

                                removed.watcher.asBinder().unlinkToDeath(this, 0);

                            }

                            i--;

                        }
@@ -6040,7 +6047,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        synchronized (mWindowMap) {

            try {

                watcher.asBinder().linkToDeath(dr, 0);

                mRotationWatchers.add(watcher);

                mRotationWatchers.add(new RotationWatcher(watcher, dr));

            } catch (RemoteException e) {

                // Client died, no cleanup needed.

            }
@@ -6054,13 +6061,17 @@ public class WindowManagerService extends IWindowManager.Stub 
        final IBinder watcherBinder = watcher.asBinder();

        synchronized (mWindowMap) {

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

                if (watcherBinder == mRotationWatchers.get(i).asBinder()) {

                    mRotationWatchers.remove(i);

                RotationWatcher rotationWatcher = mRotationWatchers.get(i);

                if (watcherBinder == rotationWatcher.watcher.asBinder()) {

                    RotationWatcher removed = mRotationWatchers.remove(i);

                    if (removed != null) {

                        removed.watcher.asBinder().unlinkToDeath(removed.dr, 0);

                        i--;

                    }

                }

            }

        }

    }



    /**

     * Apps that use the compact menu panel (as controlled by the panelMenuIsCompact