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

Unverified Commit 922b838b authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-security-14.0.0_r13' of... 

Merge tag 'android-security-14.0.0_r13' of https://android.googlesource.com/platform/frameworks/base into HEAD

Android Security 14.0.0 Release 13 (12199513)

* tag 'android-security-14.0.0_r13' of https://android.googlesource.com/platform/frameworks/base:
  Check whether installerPackageName contains only valid characters
  Fail parseUri if end is missing
  Update AccountManagerService checkKeyIntent.

Change-Id: I62f9a9c1c79fc3905efb8bac64ac1c2a3890fdb9
parents 4c1696b6 ba8897f3

core/java/android/content/Intent.java

+3 −0
Original line number Diff line number Diff line
@@ -8156,6 +8156,9 @@ public class Intent implements Parcelable, Cloneable { 
                int eq = uri.indexOf('=', i);

                if (eq < 0) eq = i-1;

                int semi = uri.indexOf(';', i);

                if (semi < 0) {

                    throw new URISyntaxException(uri, "uri end not found");

                }

                String value = eq < semi ? Uri.decode(uri.substring(eq + 1, semi)) : "";















                // action

































services/core/java/com/android/server/accounts/AccountManagerService.java



+3
−0






























Original line number
Diff line number
Diff line








@@ -5017,6 +5017,9 @@ public class AccountManagerService













                if (resolveInfo == null) {















                    return false;















                }













                if ("content".equals(intent.getScheme())) {













                    return false;













                }















                ActivityInfo targetActivityInfo = resolveInfo.activityInfo;















                int targetUid = targetActivityInfo.applicationInfo.uid;















                PackageManagerInternal pmi = LocalServices.getService(PackageManagerInternal.class);

































services/core/java/com/android/server/pm/PackageInstallerService.java



+7
−2






























Original line number
Diff line number
Diff line








@@ -693,13 +693,18 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements













        params.appLabel = TextUtils.trimToSize(params.appLabel,















                PackageItemInfo.MAX_SAFE_LABEL_LENGTH);





























        // Validate installer package name.













        // Validate requested installer package name.















        if (params.installerPackageName != null && !isValidPackageName(















                params.installerPackageName)) {















            params.installerPackageName = null;















        }





























        var requestedInstallerPackageName =













        // Validate installer package name.













        if (installerPackageName != null && !isValidPackageName(installerPackageName)) {













            installerPackageName = null;













        }



























        String requestedInstallerPackageName =















                params.installerPackageName != null ? params.installerPackageName















                        : installerPackageName;