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

Commit 3a51a85a authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Only show error if screenshot process dies within timeout period" into rvc-dev

parents 0053a10e 700a093b

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

+5 −2
Original line number Diff line number Diff line
@@ -351,11 +351,14 @@ public class ScreenshotHelper { 
                                mContext.unbindService(mScreenshotConnection);

                                mScreenshotConnection = null;

                                mScreenshotService = null;

                                // only log an error if we're still within the timeout period

                                if (handler.hasCallbacks(mScreenshotTimeout)) {

                                    handler.removeCallbacks(mScreenshotTimeout);

                                    notifyScreenshotError();

                                }

                            }

                        }

                    }

                };

                if (mContext.bindServiceAsUser(serviceIntent, conn,

                        Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE,