Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7b879999: Merge "Fix issue #7238170: Edit picture option is not available for the secondary user." into jb-mr1-dev

Browse Source 
* commit '7b879999fe2bef549ed1c04259fcd7f07e10e83b':
  Fix issue #7238170: Edit picture option is not available for the secondary user.
This commit is contained in:
Dianne Hackborn
2012-09-26 16:05:35 -07:00
committed by Android Git Automerger
parent cbc289ae0c 7b879999fe
commit c73f3d5cea
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -436,9 +436,10 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte
if (mBaseResolveList != null) {
mCurrentResolveList = mBaseResolveList;
} else {
mCurrentResolveList = mPm.queryIntentActivities(
mCurrentResolveList = mPm.queryIntentActivitiesAsUser(
mIntent, PackageManager.MATCH_DEFAULT_ONLY
| (mAlwaysUseOption ? PackageManager.GET_RESOLVED_FILTER : 0));
| (mAlwaysUseOption ? PackageManager.GET_RESOLVED_FILTER : 0),
UserHandle.getUserId(mLaunchedFromUid));
// Filter out any activities that the launched uid does not
// have permission for. We don't do this when we have an explicit
// list of resolved activities, because that only happens when