From 6874cd5635916b60578ee034cfc5a9756cdbef9c Mon Sep 17 00:00:00 2001
From: Sumedh Sen <sumedhsen@google.com>
Date: Thu, 31 Aug 2023 13:35:15 -0700
Subject: Ignore exception if already unbound from service

Bug: 298304011
Test: Presubmit
Change-Id: I12e4923546596e43b4a45de652bc4974c3f91519
---
 .../java/com/android/server/pm/InstantAppResolverConnection.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/InstantAppResolverConnection.java b/services/core/java/com/android/server/pm/InstantAppResolverConnection.java
index c47775192c42..32329dedb8ee 100644
--- a/services/core/java/com/android/server/pm/InstantAppResolverConnection.java
+++ b/services/core/java/com/android/server/pm/InstantAppResolverConnection.java
@@ -212,7 +212,12 @@ final class InstantAppResolverConnection implements DeathRecipient {
                 if (DEBUG_INSTANT) {
                     Slog.i(TAG, "[" + token + "] Previous connection never established; rebinding");
                 }
-                mContext.unbindService(mServiceConnection);
+                try {
+                    mContext.unbindService(mServiceConnection);
+                } catch (Exception e) {
+                    Slog.e(TAG, "[" + token + "] Service already unbound", e);
+                }
+
             }
             if (DEBUG_INSTANT) {
                 Slog.v(TAG, "[" + token + "] Binding to instant app resolver");
-- 
cgit v1.2.3-59-g8ed1b