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

Unverified Commit f742289f authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r62' of... 

Merge tag 'android-security-11.0.0_r62' of https://android.googlesource.com/platform/packages/apps/Settings into staging/lineage-18.1_merge_android-security-11.0.0_r62

Android Security 11.0.0 Release 62 (9269287)

* tag 'android-security-11.0.0_r62' of https://android.googlesource.com/platform/packages/apps/Settings:
  Prevent exfiltration of system files via avatar picker.
  Revert "Prevent exfiltration of system files via user image settings."

Change-Id: Ic49e102477c68fd4b606218f69a234b3b7342780
parents d0d36abb 17123fed

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;

    }