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

Commit bebfed8b authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Make screenshot process unbind correctly" into rvc-qpr-dev am: 8a912c71 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087986

Change-Id: I63421e3e9672afb61842b75e9cc7a476cc3fb532
parents c421452c 8a912c71

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

+4 −3
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ public class ScreenshotHelper { 
            };



            Message msg = Message.obtain(null, screenshotType, screenshotRequest);

            final ServiceConnection myConn = mScreenshotConnection;



            Handler h = new Handler(handler.getLooper()) {

                @Override

                public void handleMessage(Message msg) {
@@ -304,8 +304,8 @@ public class ScreenshotHelper { 
                            break;

                        case SCREENSHOT_MSG_PROCESS_COMPLETE:

                            synchronized (mScreenshotLock) {

                                if (myConn != null && mScreenshotConnection == myConn) {

                                    mContext.unbindService(myConn);

                                if (mScreenshotConnection != null) {

                                    mContext.unbindService(mScreenshotConnection);

                                    mScreenshotConnection = null;

                                    mScreenshotService = null;

                                }
@@ -368,6 +368,7 @@ public class ScreenshotHelper { 
                }

            } else {

                Messenger messenger = new Messenger(mScreenshotService);



                try {

                    messenger.send(msg);

                } catch (RemoteException e) {