1 files changed, 15 insertions, 0 deletions
diff --git a/java/src/com/android/intentresolver/chooser/MultiDisplayResolveInfo.java b/java/src/com/android/intentresolver/chooser/MultiDisplayResolveInfo.java
index b97e6b45..4fe28384 100644
--- a/java/src/com/android/intentresolver/chooser/MultiDisplayResolveInfo.java
+++ b/java/src/com/android/intentresolver/chooser/MultiDisplayResolveInfo.java
@@ -17,9 +17,11 @@
 package com.android.intentresolver.chooser;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 
@@ -121,6 +123,19 @@ public class MultiDisplayResolveInfo extends DisplayResolveInfo {
     }
 
     @Override
+    public ComponentName getResolvedComponentName() {
+        if (hasSelected()) {
+            return mTargetInfos.get(mSelected).getResolvedComponentName();
+        }
+        // It is not expected to have this method be called on an unselected multi-display item.
+        // Call super to preserve the legacy (most likely erroneous) behavior.
+        Log.wtf(
+                "ChooserActivity",
+                "retrieving ResolvedComponentName from an unselected MultiDisplayResolveInfo");
+        return super.getResolvedComponentName();
+    }
+
+    @Override
     public boolean startAsUser(Activity activity, Bundle options, UserHandle user) {
         return mTargetInfos.get(mSelected).startAsUser(activity, options, user);
     }