From ce673ffd228234bdcb986bc44ecd40a201283571 Mon Sep 17 00:00:00 2001
From: Nicolas Prevot <nprevot@google.com>
Date: Tue, 29 Jul 2014 12:18:30 +0100
Subject: [PATCH] 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
---
 .../com/android/internal/app/IntentForwarderActivity.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java
index 1c013530f209b..af38b3e4bfded 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?");