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

Commit 729073e1 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 am: 11e31f86 am: ec217d20

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

Change-Id: I8c2199f4312d1f07dcc1997deb927a2ad992a23d
parents 7661e793 ec217d20

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,