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

Commit 9f8f1fd9 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Clean up leaked screenshot connections 

If a subsequent screenshot is taken after we bind to the screenshot
service, but before we get the onServiceConnected callback, we
leak the connection to the service, preventing it from ever getting
shut down. Fix this by unbinding the old connection before connecting
with the new one.

Bug: 242862442
Fix: 242862442
Test: forced DisplayPolicy to take two consecutive screenshots

Change-Id: Iffb62170266a2c1bb332bfb416f0f5e19c5236fb
parent 6c137496

core/java/com/android/internal/util/ScreenshotHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -377,6 +377,9 @@ public class ScreenshotHelper { 
            msg.replyTo = new Messenger(h);



            if (mScreenshotConnection == null || mScreenshotService == null) {

                if (mScreenshotConnection != null) {

                    resetConnection();

                }

                final ComponentName serviceComponent = ComponentName.unflattenFromString(

                        mContext.getResources().getString(

                                com.android.internal.R.string.config_screenshotServiceComponent));