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

Commit 166b9e04 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

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

Change-Id: I35d492f5dd522ff7eafeea8d5c984e4a19e69455
parents c6b5fb65 11e31f86

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

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

                                mContext.unbindService(mScreenshotConnection);

                                mScreenshotConnection = null;

                                mScreenshotConnection = null;

                                mScreenshotService = null;

                                mScreenshotService = null;

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

                                if (handler.hasCallbacks(mScreenshotTimeout)) {

                                    handler.removeCallbacks(mScreenshotTimeout);

                                    handler.removeCallbacks(mScreenshotTimeout);

                                    notifyScreenshotError();

                                    notifyScreenshotError();

                                }

                                }

                            }

                            }

                        }

                        }

                    }

                };

                };

                if (mContext.bindServiceAsUser(serviceIntent, conn,

                if (mContext.bindServiceAsUser(serviceIntent, conn,

                        Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE,

                        Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE,