commit ea555e27407ad2a32d2682c08f423d2af71f2a91
author Amith Yamasani <yamasani@google.com> Tue Feb 14 16:12:27 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 14 16:12:27 2012 -0800
tree 40000318f20d4e9f8cc50a47656a15038dc42567
parent d658c024ea35ec267be98f1d0b9b3cec7cbde888
parent c600e21ffc723260b487e0b8b097452f6b880aab

Merge "Mixed up uid and user-id."

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index ac311b8..9d5caae 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -6995,7 +6995,7 @@
                         /* TODO: Send this to all users */
                         broadcastIntentLocked(null, null, intent, null, finisher,
                                 0, null, null, null, true, false, MY_PID, Process.SYSTEM_UID,
-                                Process.SYSTEM_UID);
+                                0 /* UserId zero */);
                         if (finisher != null) {
                             mWaitingUpdate = true;
                         }