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

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

Merge "Only show error if screenshot process dies within timeout period" into... 

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

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

Change-Id: I7df8fd90028980a0815d8fb08e27fa11d08b68ef
parents f7eacab7 3a51a85a

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,