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

Commit 6d7766e8 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents f25c353b 922b838b

core/java/android/content/Intent.java

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

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

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

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

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

                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)) : "";

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











                // action




                // action
































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



+3
−0






























Original line number
Original line
Diff line number
Diff line







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






                if (resolveInfo == null) {




                if (resolveInfo == null) {








                    return false;




                    return false;








                }




                }










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










                    return false;










                }








                ActivityInfo targetActivityInfo = resolveInfo.activityInfo;




                ActivityInfo targetActivityInfo = resolveInfo.activityInfo;








                int targetUid = targetActivityInfo.applicationInfo.uid;




                int targetUid = targetActivityInfo.applicationInfo.uid;








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




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
































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



+7
−2






























Original line number
Original line
Diff line number
Diff line







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






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




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








                PackageItemInfo.MAX_SAFE_LABEL_LENGTH);




                PackageItemInfo.MAX_SAFE_LABEL_LENGTH);






















        // Validate installer package name.




        // Validate requested installer package name.








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




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








                params.installerPackageName)) {




                params.installerPackageName)) {








            params.installerPackageName = null;




            params.installerPackageName = null;








        }




        }






















        var requestedInstallerPackageName =




        // Validate installer package name.










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










            installerPackageName = null;










        }





















        String requestedInstallerPackageName =








                params.installerPackageName != null ? params.installerPackageName




                params.installerPackageName != null ? params.installerPackageName








                        : installerPackageName;




                        : installerPackageName;