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

Commit e202cad1 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't crash when preferred activity settings are malformed 

We also now ignore attempts to set preferred resolutions with
intent filters for which no actions are defined.

Bug 11392870

Change-Id: If0d0b37bf01b59463985441edfc2bddd070bfc2a
parent e5c1208e

services/java/com/android/server/pm/PackageManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -9965,6 +9965,10 @@ public class PackageManagerService extends IPackageManager.Stub { 
        // writer

        int callingUid = Binder.getCallingUid();

        enforceCrossUserPermission(callingUid, userId, true, "add preferred activity");

        if (filter.countActions() == 0) {

            Slog.w(TAG, "Cannot set a preferred activity with no filter actions");

            return;

        }

        synchronized (mPackages) {

            if (mContext.checkCallingOrSelfPermission(

                    android.Manifest.permission.SET_PREFERRED_APPLICATIONS)
@@ -10024,7 +10028,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                String category = filter.getCategory(0);

                while (it.hasNext()) {

                    PreferredActivity pa = it.next();

                    if (pa.getAction(0).equals(action) && pa.getCategory(0).equals(category)) {

                    if ((pa.countActions() == 0) || (pa.countCategories() == 0)

                            || (pa.getAction(0).equals(action)

                                    && pa.getCategory(0).equals(category))) {

                        if (removed == null) {

                            removed = new ArrayList<PreferredActivity>();

                        }