commit f5323fee2a7deaf264ed10fbe3d9c69055987e55
author Ben Gruver <bgruv@google.com> Wed Jul 31 15:09:51 2013 -0700
committer Ben Gruver <bgruv@google.com> Wed Aug 07 17:25:21 2013 -0700
tree 8450b9a63743c81d3efb6b1b85d5d77507a1a6bd
parent b62237938eb1379980eb80004137d6dcd6ff14f7

Pass in the ComponentName of the resolved service for service intents

Change-Id: I893035d5f2dba470d19a091c7a5945b13d9c9b67

services/java/com/android/server/firewall/Filter.java

diff --git a/services/java/com/android/server/firewall/Filter.java b/services/java/com/android/server/firewall/Filter.java
index 740cbe97..25105e1 100644
--- a/services/java/com/android/server/firewall/Filter.java
+++ b/services/java/com/android/server/firewall/Filter.java
@@ -16,6 +16,7 @@
 
 package com.android.server.firewall;
 
+import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 
@@ -24,12 +25,13 @@
      * Does the given intent + context info match this filter?
      *
      * @param ifw The IntentFirewall instance
+     * @param resolvedComponent The actual component that the intent was resolved to
      * @param intent The intent being started/bound/broadcast
      * @param callerUid The uid of the caller
      * @param callerPid The pid of the caller
      * @param resolvedType The resolved mime type of the intent
      * @param resolvedApp The application that contains the resolved component that the intent is
      */
-    boolean matches(IntentFirewall ifw, Intent intent, int callerUid, int callerPid,
-            String resolvedType, ApplicationInfo resolvedApp);
+    boolean matches(IntentFirewall ifw, ComponentName resolvedComponent, Intent intent,
+            int callerUid, int callerPid, String resolvedType, ApplicationInfo resolvedApp);
 }