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

Commit 17123fed authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19449016, 19745058] into security-aosp-rvc-release. 

Change-Id: I746992c2e82207f02f00a79ff53b09109a0f78ab
parents 6a048970 a28eabcb

src/com/android/settings/users/EditUserPhotoController.java

+5 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.Bitmap.Config;
@@ -268,13 +269,13 @@ public class EditUserPhotoController { 
    }



    private boolean startSystemActivityForResult(Intent intent, int code) {

        ActivityInfo info = intent.resolveActivityInfo(mContext.getPackageManager(),

                PackageManager.MATCH_SYSTEM_ONLY);

        if (info == null) {

        List<ResolveInfo> resolveInfos = mContext.getPackageManager()

                .queryIntentActivities(intent, PackageManager.MATCH_SYSTEM_ONLY);

        if (resolveInfos.isEmpty()) {

            Log.w(TAG, "No system package activity could be found for code " + code);

            return false;

        }

        intent.setPackage(info.packageName);

        intent.setPackage(resolveInfos.get(0).activityInfo.packageName);

        mFragment.startActivityForResult(intent, code);

        return true;

    }