Merge "Avoid resetting InCallAdapter when set." into main

1 files changed, 6 insertions, 0 deletions

diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index 13a045858ab1..f3dfcd7db8e3 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -384,8 +384,14 @@ public abstract class InCallService extends Service {
 
     /** Manages the binder calls so that the implementor does not need to deal with it. */
     private final class InCallServiceBinder extends IInCallService.Stub {
+        private boolean mInCallAdapterSet;
         @Override
         public void setInCallAdapter(IInCallAdapter inCallAdapter) {
+            if (mInCallAdapterSet) {
+                Log.i(this, "setInCallAdapter: InCallAdapter already set, skipping...");
+                return;
+            }
+            mInCallAdapterSet = true;
             mHandler.obtainMessage(MSG_SET_IN_CALL_ADAPTER, inCallAdapter).sendToTarget();
         }