From 4870ad401892266a6bf47d5361e5d98ec9b84968 Mon Sep 17 00:00:00 2001
From: Miranda Kephart <mkephart@google.com>
Date: Tue, 14 Mar 2023 15:33:35 -0400
Subject: [PATCH] Unbind screenshot connection even if the binding attempt
 fails

Bug: 273563486
Test: manual, by forcing the bindServiceAsUser method to return false
for screenshots after connecting. we do get spurious logs in that case
before the fix, but not after.

Change-Id: Ic729a3aad9dc7f7a6c396746c6c8ae706384fb5f
---
 core/java/com/android/internal/util/ScreenshotHelper.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/com/android/internal/util/ScreenshotHelper.java b/core/java/com/android/internal/util/ScreenshotHelper.java
index 3a393b6897175..69d3d6a6d521b 100644
--- a/core/java/com/android/internal/util/ScreenshotHelper.java
+++ b/core/java/com/android/internal/util/ScreenshotHelper.java
@@ -195,6 +195,8 @@ public class ScreenshotHelper {
                         UserHandle.CURRENT)) {
                     mScreenshotConnection = conn;
                     handler.postDelayed(mScreenshotTimeout, timeoutMs);
+                } else {
+                    mContext.unbindService(conn);
                 }
             } else {
                 Messenger messenger = new Messenger(mScreenshotService);