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

Commit 788c8423 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

More settings cleanup 

* While parsing the packages.xml file, don't call getPackagesLPw(); we'll
  never find a package unless something has gone horribly wrong. Instead,
  build the PackageSetting like a sane person and add it to internal
  structures.
* Add methods to create a proper copy of the PackageSetting object and
  not just the data from one class in the middle of the hierarchy.
* Stop converting Sets into Lists back into Sets when creating
  IntentFilterVerificationInfo objects
* Remove the name argument when adding a package setting; it should always
  be the name in the package setting

Bug: 30219944
Change-Id: I7fa2c540621fb5d70a59b15919bfd31d8465e25d
parent 13715d52

core/java/android/content/pm/IntentFilterVerificationInfo.java

+4 −4
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ public final class IntentFilterVerificationInfo implements Parcelable { 
        mMainStatus = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;

    }



    public IntentFilterVerificationInfo(String packageName, ArrayList<String> domains) {

    public IntentFilterVerificationInfo(String packageName, ArraySet<String> domains) {

        mPackageName = packageName;

        mDomains.addAll(domains);

        mDomains = domains;

        mMainStatus = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;

    }
@@ -96,8 +96,8 @@ public final class IntentFilterVerificationInfo implements Parcelable { 
        return mDomains;

    }



    public void setDomains(ArrayList<String> list) {

        mDomains = new ArraySet<>(list);

    public void setDomains(ArraySet<String> list) {

        mDomains = list;

    }



    public String getDomainsString() {

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

+11 −10
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
    private static final boolean DEBUG_TRIAGED_MISSING = false;

    private static final boolean DEBUG_APP_DATA = false;













    /** REMOVE. According to Svet, this was only used to reset permissions during development. */















    static final boolean CLEAR_RUNTIME_PERMISSIONS_ON_UPGRADE = false;





























    private static final boolean DISABLE_EPHEMERAL_APPS = !Build.IS_DEBUGGABLE;










@@ -801,10 +802,9 @@ public class PackageManagerService extends IPackageManager.Stub {













                    PackageParser.ActivityIntentInfo filter = filters.get(m);















                    domainsSet.addAll(filter.getHostsList());















                }













                ArrayList<String> domainsList = new ArrayList<>(domainsSet);















                synchronized (mPackages) {















                    if (mSettings.createIntentFilterVerificationIfNeededLPw(













                            packageName, domainsList) != null) {













                            packageName, domainsSet) != null) {















                        scheduleWriteSettingsLocked();















                    }















                }










@@ -2873,7 +2873,6 @@ public class PackageManagerService extends IPackageManager.Stub {



























        SystemConfig systemConfig = SystemConfig.getInstance();















        ArraySet<String> packages = systemConfig.getLinkedApps();













        ArraySet<String> domains = new ArraySet<String>();





























        for (String packageName : packages) {















            PackageParser.Package pkg = mPackages.get(packageName);









@@ -2883,16 +2882,19 @@ public class PackageManagerService extends IPackageManager.Stub {













                    continue;















                }



























                domains.clear();













                ArraySet<String> domains = null;















                for (PackageParser.Activity a : pkg.activities) {















                    for (ActivityIntentInfo filter : a.intents) {















                        if (hasValidDomains(filter)) {













                            if (domains == null) {













                                domains = new ArraySet<String>();













                            }















                            domains.addAll(filter.getHostsList());















                        }















                    }















                }



























                if (domains.size() > 0) {













                if (domains != null && domains.size() > 0) {















                    if (DEBUG_DOMAIN_VERIFICATION) {















                        Slog.v(TAG, "      + " + packageName);















                    }









@@ -2900,8 +2902,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                    // state w.r.t. the formal app-linkage "no verification attempted" state;















                    // and then 'always' in the per-user state actually used for intent resolution.















                    final IntentFilterVerificationInfo ivi;













                    ivi = mSettings.createIntentFilterVerificationIfNeededLPw(packageName,













                            new ArrayList<String>(domains));













                    ivi = mSettings.createIntentFilterVerificationIfNeededLPw(packageName, domains);















                    ivi.setStatus(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED);















                    mSettings.updateIntentFilterVerificationStatusLPw(packageName,















                            INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS, userId);










@@ -8164,12 +8165,12 @@ public class PackageManagerService extends IPackageManager.Stub {



























            // Just create the setting, don't add it yet. For already existing packages















            // the PkgSetting exists already and doesn't have to be created.













            pkgSetting = mSettings.getPackageLPw(pkg, origPackage, realName, suid, destCodeFile,













                    destResourceFile, pkg.applicationInfo.nativeLibraryRootDir,













            pkgSetting = mSettings.getPackageWithBenefitsLPw(pkg, origPackage, realName, suid,













                    destCodeFile, destResourceFile, pkg.applicationInfo.nativeLibraryRootDir,















                    pkg.applicationInfo.primaryCpuAbi,















                    pkg.applicationInfo.secondaryCpuAbi,















                    pkg.applicationInfo.flags, pkg.applicationInfo.privateFlags,













                    user, false);













                    user);















            if (pkgSetting == null) {















                throw new PackageManagerException(INSTALL_FAILED_INSUFFICIENT_STORAGE,















                        "Creating application package " + pkg.packageName + " failed");

































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



+28
−4




























Original line number
Diff line number
Diff line








@@ -30,15 +30,23 @@ final class PackageSetting extends PackageSettingBase {













    int appId;















    PackageParser.Package pkg;















    SharedUserSetting sharedUser;













    /**













     * Temporary holding space for the shared user ID. While parsing package settings, the













     * shared users tag may be after the packages. In this case, we must delay linking the













     * shared user setting with the package setting. The shared user ID lets us link the













     * two objects.













     */













    private int sharedUserId;































    PackageSetting(String name, String realName, File codePath, File resourcePath,















            String legacyNativeLibraryPathString, String primaryCpuAbiString,















            String secondaryCpuAbiString, String cpuAbiOverrideString,















            int pVersionCode, int pkgFlags, int privateFlags, String parentPackageName,













            List<String> childPackageNames) {













            List<String> childPackageNames, int sharedUserId) {















        super(name, realName, codePath, resourcePath, legacyNativeLibraryPathString,















                primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,















                pVersionCode, pkgFlags, privateFlags, parentPackageName, childPackageNames);













        this.sharedUserId = sharedUserId;















    }































    /**









@@ -47,10 +55,14 @@ final class PackageSetting extends PackageSettingBase {













     */















    PackageSetting(PackageSetting orig) {















        super(orig);













        doCopy(orig);













    }





























        appId = orig.appId;













        pkg = orig.pkg;













        sharedUser = orig.sharedUser;













    public int getSharedUserId() {













        if (sharedUser != null) {













            return sharedUser.userId;













        }













        return sharedUserId;















    }































    @Override









@@ -60,6 +72,18 @@ final class PackageSetting extends PackageSettingBase {













            + " " + name + "/" + appId + "}";















    }





























    public void copyFrom(PackageSetting orig) {













        super.copyFrom(orig);













        doCopy(orig);













    }



























    private void doCopy(PackageSetting orig) {













        appId = orig.appId;













        pkg = orig.pkg;













        sharedUser = orig.sharedUser;













        sharedUserId = orig.sharedUserId;













    }





























    public PermissionsState getPermissionsState() {















        return (sharedUser != null)















                ? sharedUser.getPermissionsState()

































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



+40
−59




























Original line number
Diff line number
Diff line








@@ -147,51 +147,12 @@ abstract class PackageSettingBase extends SettingBase {













                secondaryCpuAbiString, cpuAbiOverrideString, pVersionCode);















    }





























    /**













     * New instance of PackageSetting with one-level-deep cloning.













     */













    @SuppressWarnings("unchecked")













    /** New instance of PackageSetting with one-level-deep cloning. */















    PackageSettingBase(PackageSettingBase base) {















        super(base);





























        name = base.name;















        realName = base.realName;













        codePath = base.codePath;













        codePathString = base.codePathString;













        resourcePath = base.resourcePath;













        resourcePathString = base.resourcePathString;













        legacyNativeLibraryPathString = base.legacyNativeLibraryPathString;













        primaryCpuAbiString = base.primaryCpuAbiString;













        secondaryCpuAbiString = base.secondaryCpuAbiString;













        cpuAbiOverrideString = base.cpuAbiOverrideString;













        timeStamp = base.timeStamp;













        firstInstallTime = base.firstInstallTime;













        lastUpdateTime = base.lastUpdateTime;













        versionCode = base.versionCode;



























        uidError = base.uidError;



























        signatures = new PackageSignatures(base.signatures);



























        installPermissionsFixed = base.installPermissionsFixed;













        userState.clear();













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













            userState.put(base.userState.keyAt(i),













                    new PackageUserState(base.userState.valueAt(i)));













        }













        installStatus = base.installStatus;



























        origPackage = base.origPackage;



























        installerPackageName = base.installerPackageName;













        isOrphaned = base.isOrphaned;













        volumeUuid = base.volumeUuid;



























        keySetData = new PackageKeySetData(base.keySetData);



























        parentPackageName = base.parentPackageName;













        childPackageNames = (base.childPackageNames != null)













                ? new ArrayList<>(base.childPackageNames) : null;













        doCopy(base);















    }































    void init(File codePath, File resourcePath, String legacyNativeLibraryPathString,










@@ -237,27 +198,47 @@ abstract class PackageSettingBase extends SettingBase {













    }































    /**













     * Make a shallow copy of this package settings.













     * Makes a shallow copy of the given package settings.













     *













     * NOTE: For some fields [such as keySetData, signatures, userState, verificationInfo, etc...],













     * the original object is copied and a new one is not created.















     */













    public void copyFrom(PackageSettingBase base) {













        mPermissionsState.copyFrom(base.mPermissionsState);













        primaryCpuAbiString = base.primaryCpuAbiString;













        secondaryCpuAbiString = base.secondaryCpuAbiString;













        cpuAbiOverrideString = base.cpuAbiOverrideString;













        timeStamp = base.timeStamp;













        firstInstallTime = base.firstInstallTime;













        lastUpdateTime = base.lastUpdateTime;













        signatures = base.signatures;













        installPermissionsFixed = base.installPermissionsFixed;













    public void copyFrom(PackageSettingBase orig) {













        super.copyFrom(orig);













        doCopy(orig);













    }



























    private void doCopy(PackageSettingBase orig) {













        childPackageNames = (orig.childPackageNames != null)













                ? new ArrayList<>(orig.childPackageNames) : null;













        codePath = orig.codePath;













        codePathString = orig.codePathString;













        cpuAbiOverrideString = orig.cpuAbiOverrideString;













        firstInstallTime = orig.firstInstallTime;













        installPermissionsFixed = orig.installPermissionsFixed;













        installStatus = orig.installStatus;













        installerPackageName = orig.installerPackageName;













        isOrphaned = orig.isOrphaned;













        keySetData = orig.keySetData;













        lastUpdateTime = orig.lastUpdateTime;













        legacyNativeLibraryPathString = orig.legacyNativeLibraryPathString;













        // Intentionally skip oldCodePaths; it's not relevant for copies













        origPackage = orig.origPackage;













        parentPackageName = orig.parentPackageName;













        primaryCpuAbiString = orig.primaryCpuAbiString;













        resourcePath = orig.resourcePath;













        resourcePathString = orig.resourcePathString;













        secondaryCpuAbiString = orig.secondaryCpuAbiString;













        signatures = orig.signatures;













        timeStamp = orig.timeStamp;













        uidError = orig.uidError;















        userState.clear();













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













            userState.put(base.userState.keyAt(i), base.userState.valueAt(i));













        }













        installStatus = base.installStatus;













        keySetData = base.keySetData;













        verificationInfo = base.verificationInfo;













        installerPackageName = base.installerPackageName;













        volumeUuid = base.volumeUuid;













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













            userState.put(orig.userState.keyAt(i), orig.userState.valueAt(i));













        }













        verificationInfo = orig.verificationInfo;













        versionCode = orig.versionCode;













        volumeUuid = orig.volumeUuid;















    }































    private PackageUserState modifyUserState(int userId) {

































services/core/java/com/android/server/pm/PendingPackage.java
deleted100644 → 0



+0
−35




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2011 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package com.android.server.pm;



























import java.io.File;













import java.util.List;



























final class PendingPackage extends PackageSettingBase {













    final int sharedId;



























    PendingPackage(String name, String realName, File codePath, File resourcePath,













            String legacyNativeLibraryPathString, String primaryCpuAbiString,













            String secondaryCpuAbiString, String cpuAbiOverrideString, int sharedId,













            int pVersionCode, int pkgFlags, int pkgPrivateFlags, String parentPackageName,













            List<String> childPackageNames) {













        super(name, realName, codePath, resourcePath, legacyNativeLibraryPathString,













                primaryCpuAbiString, secondaryCpuAbiString, cpuAbiOverrideString,













                pVersionCode, pkgFlags, pkgPrivateFlags, parentPackageName, childPackageNames);













        this.sharedId = sharedId;













    }













}