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

Commit cf82703f authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Move query methods 

Continue trying to reduce the size of PackageManagerService by
extracting intent queries to a separate class. This is the first,
low hanging fruit, pass.

Test: Manual
Fixes: 110090130
Change-Id: I89f6968b3460ad9d64cdac75bea1eac8a9c90599
parent 6dd61f53

core/java/android/content/pm/PackageManagerInternal.java

+12 −7
Original line number Diff line number Diff line
@@ -649,14 +649,13 @@ public abstract class PackageManagerInternal { 
    public abstract boolean isDataRestoreSafe(@NonNull Signature restoringFromSig,

            @NonNull String packageName);





    /**

     * Returns true if the the signing information for {@code clientUid} is sufficient to gain

     * access gated by {@code capability}.  This can happen if the two UIDs have the same signing

     * information, if the signing information {@code clientUid} indicates that it has the signing

     * certificate for {@code serverUid} in its signing history (if it was previously signed by it),

     * or if the signing certificate for {@code clientUid} is in ths signing history for {@code

     * serverUid} and with the {@code capability} specified.

     * Returns {@code true} if the the signing information for {@code clientUid} is sufficient

     * to gain access gated by {@code capability}.  This can happen if the two UIDs have the

     * same signing information, if the signing information {@code clientUid} indicates that

     * it has the signing certificate for {@code serverUid} in its signing history (if it was

     * previously signed by it), or if the signing certificate for {@code clientUid} is in the

     * signing history for {@code serverUid} and with the {@code capability} specified.

     */

    public abstract boolean hasSignatureCapability(int serverUid, int clientUid,

            @PackageParser.SigningDetails.CertCapabilities int capability);
@@ -697,4 +696,10 @@ public abstract class PackageManagerInternal { 
     */

    public abstract void freeStorage(String volumeUuid, long bytes, int storageFlags)

            throws IOException;



    /** Returns {@code true} if the specified component is enabled and matches the given flags. */

    public abstract boolean isEnabledAndMatches(@NonNull ComponentInfo info, int flags, int userId);



    /** Returns {@code true} if the given user requires extra badging for icons. */

    public abstract boolean userNeedsBadging(int userId);

}

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

0 → 100644
+1847 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.IntentSender;

import android.content.pm.ActivityInfo;

import android.content.pm.InstantAppRequest;

import android.content.pm.AuxiliaryResolveInfo;

import android.content.pm.InstantAppIntentFilter;

import android.content.pm.InstantAppRequest;

import android.content.pm.InstantAppResolveInfo;

import android.content.pm.InstantAppResolveInfo.InstantAppDigest;

import android.metrics.LogMaker;
@@ -458,8 +458,8 @@ public abstract class InstantAppResolver { 
            }

            return Collections.emptyList();

        }

        final PackageManagerService.InstantAppIntentResolver instantAppResolver =

                new PackageManagerService.InstantAppIntentResolver();

        final ComponentResolver.InstantAppIntentResolver instantAppResolver =

                new ComponentResolver.InstantAppIntentResolver();

        for (int j = instantAppFilters.size() - 1; j >= 0; --j) {

            final InstantAppIntentFilter instantAppFilter = instantAppFilters.get(j);

            final List<IntentFilter> splitFilters = instantAppFilter.getFilters();

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

+152 −1658

File changed.

Preview size limit exceeded, changes collapsed.

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

+126 −116
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.content.pm.ComponentInfo; 
import android.content.pm.IntentFilterVerificationInfo;

import android.content.pm.PackageCleanItem;

import android.content.pm.PackageManager;

import android.content.pm.PackageManagerInternal;

import android.content.pm.PackageParser;

import android.content.pm.PackageUserState;

import android.content.pm.PermissionInfo;
@@ -88,6 +89,7 @@ import com.android.internal.util.FastXmlSerializer; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.JournaledFile;

import com.android.internal.util.XmlUtils;

import com.android.server.LocalServices;

import com.android.server.pm.Installer.InstallerException;

import com.android.server.pm.permission.BasePermission;

import com.android.server.pm.permission.PermissionSettings;
@@ -422,11 +424,8 @@ public final class Settings { 
    /** Settings and other information about permissions */

    final PermissionSettings mPermissions;



    Settings(PermissionSettings permissions, Object lock) {

        this(Environment.getDataDirectory(), permissions, lock);

    }



    Settings(File dataDir, PermissionSettings permission, Object lock) {

    Settings(File dataDir, PermissionSettings permission,

            Object lock) {

        mLock = lock;

        mPermissions = permission;

        mRuntimePermissionsPersistence = new RuntimePermissionPersistence(mLock);
@@ -3232,8 +3231,10 @@ public final class Settings { 
        return true;

    }



    void applyDefaultPreferredAppsLPw(PackageManagerService service, int userId) {

    void applyDefaultPreferredAppsLPw(int userId) {

        // First pull data from any pre-installed apps.

        final PackageManagerInternal pmInternal =

                LocalServices.getService(PackageManagerInternal.class);

        for (PackageSetting ps : mPackages.values()) {

            if ((ps.pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0 && ps.pkg != null

                    && ps.pkg.preferredActivityFilters != null) {
@@ -3241,7 +3242,7 @@ public final class Settings { 
                        = ps.pkg.preferredActivityFilters;

                for (int i=0; i<intents.size(); i++) {

                    PackageParser.ActivityIntentInfo aii = intents.get(i);

                    applyDefaultPreferredActivityLPw(service, aii, new ComponentName(

                    applyDefaultPreferredActivityLPw(pmInternal, aii, new ComponentName(

                                    ps.name, aii.activity.className), userId);

                }

            }
@@ -3290,7 +3291,7 @@ public final class Settings { 
                            + " does not start with 'preferred-activities'");

                    continue;

                }

                readDefaultPreferredActivitiesLPw(service, parser, userId);

                readDefaultPreferredActivitiesLPw(parser, userId);

            } catch (XmlPullParserException e) {

                Slog.w(TAG, "Error reading apps file " + f, e);

            } catch (IOException e) {
@@ -3306,8 +3307,8 @@ public final class Settings { 
        }

    }



    private void applyDefaultPreferredActivityLPw(PackageManagerService service,

            IntentFilter tmpPa, ComponentName cn, int userId) {

    private void applyDefaultPreferredActivityLPw(

            PackageManagerInternal pmInternal, IntentFilter tmpPa, ComponentName cn, int userId) {

        // The initial preferences only specify the target activity

        // component and intent-filter, not the set of matches.  So we

        // now need to query for the matches to build the correct
@@ -3332,27 +3333,31 @@ public final class Settings { 
        boolean doNonData = true;

        boolean hasSchemes = false;



        for (int ischeme=0; ischeme<tmpPa.countDataSchemes(); ischeme++) {

        final int dataSchemesCount = tmpPa.countDataSchemes();

        for (int ischeme = 0; ischeme < dataSchemesCount; ischeme++) {

            boolean doScheme = true;

            String scheme = tmpPa.getDataScheme(ischeme);

            final String scheme = tmpPa.getDataScheme(ischeme);

            if (scheme != null && !scheme.isEmpty()) {

                hasSchemes = true;

            }

            for (int issp=0; issp<tmpPa.countDataSchemeSpecificParts(); issp++) {

            final int dataSchemeSpecificPartsCount = tmpPa.countDataSchemeSpecificParts();

            for (int issp = 0; issp < dataSchemeSpecificPartsCount; issp++) {

                Uri.Builder builder = new Uri.Builder();

                builder.scheme(scheme);

                PatternMatcher ssp = tmpPa.getDataSchemeSpecificPart(issp);

                builder.opaquePart(ssp.getPath());

                Intent finalIntent = new Intent(intent);

                finalIntent.setData(builder.build());

                applyDefaultPreferredActivityLPw(service, finalIntent, flags, cn,

                applyDefaultPreferredActivityLPw(pmInternal, finalIntent, flags, cn,

                        scheme, ssp, null, null, userId);

                doScheme = false;

            }

            for (int iauth=0; iauth<tmpPa.countDataAuthorities(); iauth++) {

            final int dataAuthoritiesCount = tmpPa.countDataAuthorities();

            for (int iauth = 0; iauth < dataAuthoritiesCount; iauth++) {

                boolean doAuth = true;

                IntentFilter.AuthorityEntry auth = tmpPa.getDataAuthority(iauth);

                for (int ipath=0; ipath<tmpPa.countDataPaths(); ipath++) {

                final IntentFilter.AuthorityEntry auth = tmpPa.getDataAuthority(iauth);

                final int dataPathsCount = tmpPa.countDataPaths();

                for (int ipath = 0; ipath < dataPathsCount; ipath++) {

                    Uri.Builder builder = new Uri.Builder();

                    builder.scheme(scheme);

                    if (auth.getHost() != null) {
@@ -3362,7 +3367,7 @@ public final class Settings { 
                    builder.path(path.getPath());

                    Intent finalIntent = new Intent(intent);

                    finalIntent.setData(builder.build());

                    applyDefaultPreferredActivityLPw(service, finalIntent, flags, cn,

                    applyDefaultPreferredActivityLPw(pmInternal, finalIntent, flags, cn,

                            scheme, null, auth, path, userId);

                    doAuth = doScheme = false;

                }
@@ -3374,7 +3379,7 @@ public final class Settings { 
                    }

                    Intent finalIntent = new Intent(intent);

                    finalIntent.setData(builder.build());

                    applyDefaultPreferredActivityLPw(service, finalIntent, flags, cn,

                    applyDefaultPreferredActivityLPw(pmInternal, finalIntent, flags, cn,

                            scheme, null, auth, null, userId);

                    doScheme = false;

                }
@@ -3384,7 +3389,7 @@ public final class Settings { 
                builder.scheme(scheme);

                Intent finalIntent = new Intent(intent);

                finalIntent.setData(builder.build());

                applyDefaultPreferredActivityLPw(service, finalIntent, flags, cn,

                applyDefaultPreferredActivityLPw(pmInternal, finalIntent, flags, cn,

                        scheme, null, null, null, userId);

            }

            doNonData = false;
@@ -3400,61 +3405,69 @@ public final class Settings { 
                        Intent finalIntent = new Intent(intent);

                        builder.scheme(scheme);

                        finalIntent.setDataAndType(builder.build(), mimeType);

                        applyDefaultPreferredActivityLPw(service, finalIntent, flags, cn,

                        applyDefaultPreferredActivityLPw(pmInternal, finalIntent, flags, cn,

                                scheme, null, null, null, userId);

                    }

                }

            } else {

                Intent finalIntent = new Intent(intent);

                finalIntent.setType(mimeType);

                applyDefaultPreferredActivityLPw(service, finalIntent, flags, cn,

                applyDefaultPreferredActivityLPw(pmInternal, finalIntent, flags, cn,

                        null, null, null, null, userId);

            }

            doNonData = false;

        }



        if (doNonData) {

            applyDefaultPreferredActivityLPw(service, intent, flags, cn,

            applyDefaultPreferredActivityLPw(pmInternal, intent, flags, cn,

                    null, null, null, null, userId);

        }

    }



    private void applyDefaultPreferredActivityLPw(PackageManagerService service,

            Intent intent, int flags, ComponentName cn, String scheme, PatternMatcher ssp,

    private void applyDefaultPreferredActivityLPw(PackageManagerInternal pmInternal, Intent intent,

            int flags, ComponentName cn, String scheme, PatternMatcher ssp,

            IntentFilter.AuthorityEntry auth, PatternMatcher path, int userId) {

        flags = service.updateFlagsForResolve(flags, userId, intent, Binder.getCallingUid(), false);

        List<ResolveInfo> ri = service.mActivities.queryIntent(intent,

                intent.getType(), flags, 0);

        if (PackageManagerService.DEBUG_PREFERRED) Log.d(TAG, "Queried " + intent

                + " results: " + ri);

        final List<ResolveInfo> ri =

                pmInternal.queryIntentActivities(intent, flags, Binder.getCallingUid(), 0);

        if (PackageManagerService.DEBUG_PREFERRED) {

            Log.d(TAG, "Queried " + intent + " results: " + ri);

        }

        int systemMatch = 0;

        int thirdPartyMatch = 0;

        if (ri != null && ri.size() > 1) {

        final int numMatches = (ri == null ? 0 : ri.size());

        if (numMatches <= 1) {

            Slog.w(TAG, "No potential matches found for " + intent

                    + " while setting preferred " + cn.flattenToShortString());

            return;

        }

        boolean haveAct = false;

        ComponentName haveNonSys = null;

        ComponentName[] set = new ComponentName[ri.size()];

            for (int i=0; i<ri.size(); i++) {

                ActivityInfo ai = ri.get(i).activityInfo;

        for (int i = 0; i < numMatches; i++) {

            final ActivityInfo ai = ri.get(i).activityInfo;

            set[i] = new ComponentName(ai.packageName, ai.name);

            if ((ai.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {

                if (ri.get(i).match >= thirdPartyMatch) {

                    // Keep track of the best match we find of all third

                    // party apps, for use later to determine if we actually

                    // want to set a preferred app for this intent.

                        if (PackageManagerService.DEBUG_PREFERRED) Log.d(TAG, "Result "

                                + ai.packageName + "/" + ai.name + ": non-system!");

                    if (PackageManagerService.DEBUG_PREFERRED) {

                        Log.d(TAG, "Result " + ai.packageName + "/" + ai.name + ": non-system!");

                    }

                    haveNonSys = set[i];

                    break;

                }

            } else if (cn.getPackageName().equals(ai.packageName)

                    && cn.getClassName().equals(ai.name)) {

                    if (PackageManagerService.DEBUG_PREFERRED) Log.d(TAG, "Result "

                            + ai.packageName + "/" + ai.name + ": default!");

                if (PackageManagerService.DEBUG_PREFERRED) {

                    Log.d(TAG, "Result " + ai.packageName + "/" + ai.name + ": default!");

                }

                haveAct = true;

                systemMatch = ri.get(i).match;

            } else {

                    if (PackageManagerService.DEBUG_PREFERRED) Log.d(TAG, "Result "

                            + ai.packageName + "/" + ai.name + ": skipped");

                if (PackageManagerService.DEBUG_PREFERRED) {

                    Log.d(TAG, "Result " + ai.packageName + "/" + ai.name + ": skipped");

                }

            }

        }

        if (haveNonSys != null && thirdPartyMatch < systemMatch) {
@@ -3514,15 +3527,12 @@ public final class Settings { 
            Slog.i(TAG, "Not setting preferred " + intent + "; found third party match "

                    + haveNonSys.flattenToShortString());

        }

        } else {

            Slog.w(TAG, "No potential matches found for " + intent + " while setting preferred "

                    + cn.flattenToShortString());

        }

    }



    private void readDefaultPreferredActivitiesLPw(PackageManagerService service,

            XmlPullParser parser, int userId)

    private void readDefaultPreferredActivitiesLPw(XmlPullParser parser, int userId)

            throws XmlPullParserException, IOException {

        final PackageManagerInternal pmInternal =

                LocalServices.getService(PackageManagerInternal.class);

        int outerDepth = parser.getDepth();

        int type;

        while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
@@ -3535,8 +3545,8 @@ public final class Settings { 
            if (tagName.equals(TAG_ITEM)) {

                PreferredActivity tmpPa = new PreferredActivity(parser);

                if (tmpPa.mPref.getParseError() == null) {

                    applyDefaultPreferredActivityLPw(service, tmpPa, tmpPa.mPref.mComponent,

                            userId);

                    applyDefaultPreferredActivityLPw(

                            pmInternal, tmpPa, tmpPa.mPref.mComponent, userId);

                } else {

                    PackageManagerService.reportSettingsProblem(Log.WARN,

                            "Error in package manager settings: <preferred-activity> "
@@ -4151,7 +4161,7 @@ public final class Settings { 
            }

        }

        synchronized (mPackages) {

            applyDefaultPreferredAppsLPw(service, userHandle);

            applyDefaultPreferredAppsLPw(userHandle);

        }

    }