commit f203aeef993b0f4ce65c9630d06bbd50a504e89f
author Amith Yamasani <yamasani@google.com> Wed Aug 29 18:41:53 2012 -0700
committer Amith Yamasani <yamasani@google.com> Thu Aug 30 16:08:23 2012 -0700
tree f1624ae664c7f882e9f320dadbab4eea52b6a4ad
parent b2dd4e87ae8ac6a0402b7a0ed37201f27bcb1b9c

Enforce permissions for calls with specified userId

Fix a couple of places where incorrect userIds were being passed in.

Change-Id: I398c676e0488ff7e584be96e96c8b32652134238

core/java/android/app/ApplicationPackageManager.java

diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 0f10c4f..91753aa 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -502,20 +502,28 @@
         }
     }
 
+    /**
+     * @hide
+     */
     @Override
-    public List<ResolveInfo> queryBroadcastReceivers(Intent intent, int flags) {
+    public List<ResolveInfo> queryBroadcastReceivers(Intent intent, int flags, int userId) {
         try {
             return mPM.queryIntentReceivers(
                 intent,
                 intent.resolveTypeIfNeeded(mContext.getContentResolver()),
                 flags,
-                UserHandle.myUserId());
+                userId);
         } catch (RemoteException e) {
             throw new RuntimeException("Package manager has died", e);
         }
     }
 
     @Override
+    public List<ResolveInfo> queryBroadcastReceivers(Intent intent, int flags) {
+        return queryBroadcastReceivers(intent, flags, UserHandle.myUserId());
+    }
+
+    @Override
     public ResolveInfo resolveService(Intent intent, int flags) {
         try {
             return mPM.resolveService(