diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-08-17 13:58:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-17 13:58:17 -0700 |
| commit | 81c304b99d920e8d66ac16332489d78ff7162e12 (patch) | |
| tree | cc73962e5561ac1a15b7a51936996fd9f13b452d /services/java | |
| parent | 5d683a013114f38f503e6f7194400f60f35bfa5a (diff) | |
| parent | 1ab36c1d83969bab7ef782af11fa1673993b76fa (diff) | |
| download | frameworks_base-81c304b99d920e8d66ac16332489d78ff7162e12.zip frameworks_base-81c304b99d920e8d66ac16332489d78ff7162e12.tar.gz frameworks_base-81c304b99d920e8d66ac16332489d78ff7162e12.tar.bz2 | |
Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index d36114c..5e85e1a 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -13493,7 +13493,7 @@ public final class ActivityManagerService extends ActivityManagerNative // Inform of user switch Intent addedIntent = new Intent(Intent.ACTION_USER_SWITCHED); addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId); - mContext.sendBroadcast(addedIntent, android.Manifest.permission.MANAGE_ACCOUNTS); + mContext.sendBroadcast(addedIntent, android.Manifest.permission.MANAGE_USERS); return true; } |