Using the selector to check if an intent can be forwarded.

In IntentFowarderActivity, if the selector of an intent is defined,
use it to check if the intent can be forwarded.

Change-Id: Ic77f70bca5596e0a5fb0fec9b7a693afaa649089

1 files changed, 5 insertions, 1 deletions

diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index 1c01353..af38b3e 100644
--- a/core/java/com/android/internal/app/IntentForwarderActivity.java
+++ b/core/java/com/android/internal/app/IntentForwarderActivity.java
@@ -83,7 +83,11 @@ public class IntentForwarderActivity extends Activity  {
         String resolvedType = newIntent.resolveTypeIfNeeded(getContentResolver());
         boolean canForward = false;
         try {
-            canForward = ipm.canForwardTo(newIntent, resolvedType, callingUserId,
+            Intent selector = newIntent.getSelector();
+            if (selector == null) {
+                selector = newIntent;
+            }
+            canForward = ipm.canForwardTo(selector, resolvedType, callingUserId,
                     userDest.getIdentifier());
         } catch (RemoteException e) {
             Slog.e(TAG, "PackageManagerService is dead?");