Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev

Amith Yamasani · Android (Google) Code Review · commit 81c304b99d92 · 2012-08-17T13:58:17.000-07:00
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
@@ -13493,7 +13493,7 @@ public boolean switchUser(int userId) {
         // 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;
     }

Original file line number	Diff line number	Diff line change
`@@ -13493,7 +13493,7 @@ public boolean switchUser(int userId) {`
`13493`	`13493`	`// Inform of user switch`
`13494`	`13494`	`Intent addedIntent = new Intent(Intent.ACTION_USER_SWITCHED);`
`13495`	`13495`	`addedIntent.putExtra(Intent.EXTRA_USER_HANDLE, userId);`
`13496`		`- mContext.sendBroadcast(addedIntent, android.Manifest.permission.MANAGE_ACCOUNTS);`
	`13496`	`+ mContext.sendBroadcast(addedIntent, android.Manifest.permission.MANAGE_USERS);`
`13497`	`13497`
`13498`	`13498`	`return true;`
`13499`	`13499`	`}`