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

Commit 221330f9 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by Android (Google) Code Review
Browse files

Merge "Prevent notifyScreenshotError() from calling twice" into nyc-mr1-dev

parents e0ca918e b2d6ed3c

services/core/java/com/android/server/policy/PhoneWindowManager.java

+9 −2
Original line number Diff line number Diff line
@@ -5534,8 +5534,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


                @Override

                public void onServiceDisconnected(ComponentName name) {

                    synchronized (mScreenshotLock) {

                        if (mScreenshotConnection != null) {

                            mContext.unbindService(mScreenshotConnection);

                            mScreenshotConnection = null;

                            mHandler.removeCallbacks(mScreenshotTimeout);

                            notifyScreenshotError();

                        }

                    }

                }

            };

            if (mContext.bindServiceAsUser(serviceIntent, conn,

                    Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE,