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

Commit 82e4b61f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move shared library info out of PackageManagerService (4/n)"

parents 9ebd54d1 da381ed3

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

+0 −6
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.PackageState;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.utils.WatchedArrayMap;

import com.android.server.utils.WatchedLongSparseArray;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -309,10 +307,6 @@ public interface Computer { 
    @Nullable

    String getRenamedPackage(@NonNull String packageName);



    @Computer.LiveImplementation(override = LiveImplementation.MANDATORY)

    @NonNull

    WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries();



    /**

     * @return set of packages to notify

     */

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

+2 −3
Original line number Diff line number Diff line
@@ -3490,9 +3490,8 @@ public class ComputerEngine implements Computer { 
        return mSettings.getRenamedPackageLPr(packageName);

    }



    @NonNull

    @Override

    public WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries() {

    private WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>>

            getSharedLibraries() {

        return mSharedLibraries.getAll();

    }

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

+0 −10
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.PackageState;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.utils.WatchedArrayMap;

import com.android.server.utils.WatchedLongSparseArray;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -267,14 +265,6 @@ public final class ComputerLocked extends ComputerEngine { 
        }

    }



    @NonNull

    @Override

    public WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries() {

        synchronized (mLock) {

            return super.getSharedLibraries();

        }

    }



    @NonNull

    @Override

    public ArraySet<String> getNotifyPackagesForReplacedReceived(@NonNull String[] packages) {

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

+0 −10
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ import android.util.SparseArray; 
import com.android.server.pm.parsing.pkg.AndroidPackage;

import com.android.server.pm.pkg.PackageState;

import com.android.server.pm.pkg.PackageStateInternal;

import com.android.server.utils.WatchedArrayMap;

import com.android.server.utils.WatchedLongSparseArray;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -701,14 +699,6 @@ public final class ComputerTracker implements Computer { 
        }

    }



    @NonNull

    @Override

    public WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> getSharedLibraries() {

        try (ThreadComputer current = snapshot()) {

            return current.mComputer.getSharedLibraries();

        }

    }



    @NonNull

    @Override

    public ArraySet<String> getNotifyPackagesForReplacedReceived(@NonNull String[] packages) {