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

Commit b87de28f authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Build usesLibraryFiles with ArraySet. 

Use ArraySet instead of using odd shared variable.

Change-Id: Ide5095069ae8f2dcb4553f37e877fc1fce33ebde
parent c5f83d0c

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

+11 −26
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ import android.system.ErrnoException; 
import android.system.Os;

import android.system.StructStat;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.AtomicFile;

import android.util.DisplayMetrics;

import android.util.EventLog;
@@ -412,9 +413,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
    final HashMap<String, SharedLibraryEntry> mSharedLibraries

            = new HashMap<String, SharedLibraryEntry>();













    // Temporary for building the final shared libraries for an .apk.













    String[] mTmpSharedLibraries = null;



























    // These are the features this devices supports that were read from the















    // etc/permissions.xml file.















    final HashMap<String, FeatureInfo> mAvailableFeatures =










@@ -4805,11 +4803,11 @@ public class PackageManagerService extends IPackageManager.Stub {













        return res;















    }



























    private int addSharedLibraryLPw(final SharedLibraryEntry file, int num,













    private void addSharedLibraryLPw(ArraySet<String> usesLibraryFiles, SharedLibraryEntry file,















            PackageParser.Package changingLib) {















        if (file.path != null) {













            mTmpSharedLibraries[num] = file.path;













            return num+1;













            usesLibraryFiles.add(file.path);













            return;















        }















        PackageParser.Package p = mPackages.get(file.apk);















        if (changingLib != null && changingLib.packageName.equals(file.apk)) {









@@ -4822,17 +4820,9 @@ public class PackageManagerService extends IPackageManager.Stub {













            }















        }















        if (p != null) {













            String path = p.mPath;













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













                if (mTmpSharedLibraries[i].equals(path)) {













                    return num;













            usesLibraryFiles.add(p.mPath);















        }















    }













            mTmpSharedLibraries[num] = p.mPath;













            return num+1;













        }













        return num;













    }





























    private boolean updateSharedLibrariesLPw(PackageParser.Package pkg,















            PackageParser.Package changingLib) {









@@ -4845,11 +4835,7 @@ public class PackageManagerService extends IPackageManager.Stub {













        }





























        if (pkg.usesLibraries != null || pkg.usesOptionalLibraries != null) {













            if (mTmpSharedLibraries == null ||













                    mTmpSharedLibraries.length < mSharedLibraries.size()) {













                mTmpSharedLibraries = new String[mSharedLibraries.size()];













            }













            int num = 0;













            final ArraySet<String> usesLibraryFiles = new ArraySet<>();















            int N = pkg.usesLibraries != null ? pkg.usesLibraries.size() : 0;















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















                final SharedLibraryEntry file = mSharedLibraries.get(pkg.usesLibraries.get(i));









@@ -4860,7 +4846,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                    mLastScanError = PackageManager.INSTALL_FAILED_MISSING_SHARED_LIBRARY;















                    return false;















                }













                num = addSharedLibraryLPw(file, num, changingLib);













                addSharedLibraryLPw(usesLibraryFiles, file, changingLib);















            }















            N = pkg.usesOptionalLibraries != null ? pkg.usesOptionalLibraries.size() : 0;















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









@@ -4870,13 +4856,12 @@ public class PackageManagerService extends IPackageManager.Stub {













                            + " desires unavailable shared library "















                            + pkg.usesOptionalLibraries.get(i) + "; ignoring!");















                } else {













                    num = addSharedLibraryLPw(file, num, changingLib);













                    addSharedLibraryLPw(usesLibraryFiles, file, changingLib);















                }















            }













            if (num > 0) {













                pkg.usesLibraryFiles = new String[num];













                System.arraycopy(mTmpSharedLibraries, 0,













                        pkg.usesLibraryFiles, 0, num);













            N = usesLibraryFiles.size();













            if (N > 0) {













                pkg.usesLibraryFiles = usesLibraryFiles.toArray(new String[N]);















            } else {















                pkg.usesLibraryFiles = null;















            }