commit 74ee8652e02fc94901177214fc9370659732c921
author Dianne Hackborn <hackbod@google.com> Fri Sep 07 18:33:18 2012 -0700
committer Dianne Hackborn <hackbod@google.com> Fri Sep 07 18:33:18 2012 -0700
tree d3b5c4848416a4957342f36b326364fb20d8e45e
parent d888399ad4a4ec0a08e97518bf22d726a8bd4eaa

Add Binder.getCallingUserHandle().

Change-Id: I2a7eedfdc7baeeb4c2cd2ca0153aa95e0cf0bf45

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 90e8d73..ca45946 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -10851,7 +10851,7 @@
                         builder.append("; this requires ");
                         builder.append(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL);
                         if (!requireFull) {
-                            builder.append("or");
+                            builder.append(" or ");
                             builder.append(android.Manifest.permission.INTERACT_ACROSS_USERS);
                         }
                         String msg = builder.toString();