Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 574fbc73 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am c73f3d5c: am 7b879999: Merge "Fix issue #7238170: Edit picture option is... 

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

* commit 'c73f3d5c':
  Fix issue #7238170: Edit picture option is not available for the secondary user.
parents 3cc8211e c73f3d5c

core/java/com/android/internal/app/ResolverActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -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