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

Commit ae037923 authored by Jackal Guo's avatar Jackal Guo
Browse files

Using for loop instead of stream 

With an ArrayList, a hand-written counted loop is faster than the
enhanced for loop and stream.

Bug: 152227957
Test: Run atest under both pm folder
Change-Id: I714eec2add030d794d0449ae8d07b572e5904880
parent de4cf918

core/java/android/content/pm/PackageInstaller.java

+9 −4
Original line number Original line Diff line number Diff line
@@ -72,7 +72,6 @@ import java.util.List; 
import java.util.Objects;

import java.util.Objects;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;

import java.util.stream.Collectors;





/**

/**

 * Offers the ability to install, upgrade, and remove applications on the

 * Offers the ability to install, upgrade, and remove applications on the
@@ -589,9 +588,15 @@ public class PackageInstaller { 
     *      * {@link SessionInfo#isStagedSessionActive()}.

     *      * {@link SessionInfo#isStagedSessionActive()}.

     */

     */

    public @NonNull List<SessionInfo> getActiveStagedSessions() {

    public @NonNull List<SessionInfo> getActiveStagedSessions() {

        return getStagedSessions().stream()

        final List<SessionInfo> activeStagedSessions = new ArrayList<>();

                .filter(s -> s.isStagedSessionActive())

        final List<SessionInfo> stagedSessions = getStagedSessions();

                .collect(Collectors.toList());

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

            final SessionInfo sessionInfo = stagedSessions.get(i);

            if (sessionInfo.isStagedSessionActive()) {

                activeStagedSessions.add(sessionInfo);

            }

        }

        return activeStagedSessions;

    }

    }





    /**

    /**

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

+24 −14
Original line number Original line Diff line number Diff line
@@ -61,11 +61,9 @@ import java.util.Collections; 
import java.util.HashSet;

import java.util.HashSet;

import java.util.Iterator;

import java.util.Iterator;

import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Objects;

import java.util.Set;

import java.util.Set;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.ExecutorService;

import java.util.stream.Collectors;





/**

/**

 * ApexManager class handles communications with the apex service to perform operation and queries,

 * ApexManager class handles communications with the apex service to perform operation and queries,
@@ -538,30 +536,42 @@ public abstract class ApexManager { 
        List<PackageInfo> getActivePackages() {

        List<PackageInfo> getActivePackages() {

            Preconditions.checkState(mAllPackagesCache != null,

            Preconditions.checkState(mAllPackagesCache != null,

                    "APEX packages have not been scanned");

                    "APEX packages have not been scanned");

            return mAllPackagesCache

            final List<PackageInfo> activePackages = new ArrayList<>();

                    .stream()

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

                    .filter(item -> isActive(item))

                final PackageInfo packageInfo = mAllPackagesCache.get(i);

                    .collect(Collectors.toList());

                if (isActive(packageInfo)) {

                    activePackages.add(packageInfo);

                }

            }

            return activePackages;

        }

        }





        @Override

        @Override

        List<PackageInfo> getFactoryPackages() {

        List<PackageInfo> getFactoryPackages() {

            Preconditions.checkState(mAllPackagesCache != null,

            Preconditions.checkState(mAllPackagesCache != null,

                    "APEX packages have not been scanned");

                    "APEX packages have not been scanned");

            return mAllPackagesCache

            final List<PackageInfo> factoryPackages = new ArrayList<>();

                    .stream()

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

                    .filter(item -> isFactory(item))

                final PackageInfo packageInfo = mAllPackagesCache.get(i);

                    .collect(Collectors.toList());

                if (isFactory(packageInfo)) {

                    factoryPackages.add(packageInfo);

                }

            }

            return factoryPackages;

        }

        }





        @Override

        @Override

        List<PackageInfo> getInactivePackages() {

        List<PackageInfo> getInactivePackages() {

            Preconditions.checkState(mAllPackagesCache != null,

            Preconditions.checkState(mAllPackagesCache != null,

                    "APEX packages have not been scanned");

                    "APEX packages have not been scanned");

            return mAllPackagesCache

            final List<PackageInfo> inactivePackages = new ArrayList<>();

                    .stream()

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

                    .filter(item -> !isActive(item))

                final PackageInfo packageInfo = mAllPackagesCache.get(i);

                    .collect(Collectors.toList());

                if (!isActive(packageInfo)) {

                    inactivePackages.add(packageInfo);

                }

            }

            return inactivePackages;

        }

        }





        @Override

        @Override

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

+16 −8
Original line number Original line Diff line number Diff line
@@ -415,7 +415,6 @@ import java.util.concurrent.atomic.AtomicInteger; 
import java.util.function.BiConsumer;

import java.util.function.BiConsumer;

import java.util.function.Consumer;

import java.util.function.Consumer;

import java.util.function.Predicate;

import java.util.function.Predicate;

import java.util.stream.Collectors;

















/**







/**











 * Keep track of all those APKs everywhere.







 * Keep track of all those APKs everywhere.










@@ -2655,6 +2654,11 @@ public class PackageManagerService extends IPackageManager.Stub









                            + partition.folder);







                            + partition.folder);











            }







            }











        }







        }



























        @Override














        public String toString() {














            return folder.getAbsolutePath() + ":" + scanFlag;














        }











    }







    }



























    public PackageManagerService(Injector injector, boolean onlyCore, boolean factoryTest) {







    public PackageManagerService(Injector injector, boolean onlyCore, boolean factoryTest) {










@@ -2757,15 +2761,19 @@ public class PackageManagerService extends IPackageManager.Stub









        mApexManager = ApexManager.getInstance();







        mApexManager = ApexManager.getInstance();











        mAppsFilter = mInjector.getAppsFilter();







        mAppsFilter = mInjector.getAppsFilter();






























        final List<ScanPartition> scanPartitions = new ArrayList<>();














        final List<ApexManager.ActiveApexInfo> activeApexInfos = mApexManager.getActiveApexInfos();














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














            final ScanPartition scanPartition = resolveApexToScanPartition(activeApexInfos.get(i));














            if (scanPartition != null) {














                scanPartitions.add(scanPartition);














            }














        }
























        mDirsToScanAsSystem = new ArrayList<>();







        mDirsToScanAsSystem = new ArrayList<>();











        mDirsToScanAsSystem.addAll(SYSTEM_PARTITIONS);







        mDirsToScanAsSystem.addAll(SYSTEM_PARTITIONS);











        mDirsToScanAsSystem.addAll(mApexManager.getActiveApexInfos().stream()







        mDirsToScanAsSystem.addAll(scanPartitions);











                .map(PackageManagerService::resolveApexToScanPartition)







        Slog.d(TAG, "Directories scanned as system partitions: " + mDirsToScanAsSystem);











                .filter(Objects::nonNull).collect(Collectors.toList()));














        Slog.d(TAG,














                "Directories scanned as system partitions: [" + mDirsToScanAsSystem.stream().map(














                        d -> (d.folder.getAbsolutePath() + ":" + d.scanFlag))














                        .collect(Collectors.joining(",")) + "]");






























        // CHECKSTYLE:OFF IndentationCheck







        // CHECKSTYLE:OFF IndentationCheck











        synchronized (mInstallLock) {







        synchronized (mInstallLock) {

























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



+22
−19




























Original line number
Original line
Diff line number
Diff line








@@ -75,13 +75,11 @@ import com.android.server.rollback.WatchdogRollbackLogger;









import java.io.File;







import java.io.File;











import java.io.IOException;







import java.io.IOException;











import java.util.ArrayList;







import java.util.ArrayList;











import java.util.Arrays;














import java.util.List;







import java.util.List;











import java.util.concurrent.LinkedBlockingQueue;







import java.util.concurrent.LinkedBlockingQueue;











import java.util.concurrent.TimeUnit;







import java.util.concurrent.TimeUnit;











import java.util.function.Consumer;







import java.util.function.Consumer;











import java.util.function.Predicate;







import java.util.function.Predicate;











import java.util.stream.Collectors;


































/**







/**











 * This class handles staged install sessions, i.e. install sessions that require packages to







 * This class handles staged install sessions, i.e. install sessions that require packages to










@@ -222,6 +220,7 @@ public class StagingManager {









        // which will be propagated to populate stagedSessionErrorMessage of this session.







        // which will be propagated to populate stagedSessionErrorMessage of this session.











        final ApexInfoList apexInfoList = mApexManager.submitStagedSession(apexSessionParams);







        final ApexInfoList apexInfoList = mApexManager.submitStagedSession(apexSessionParams);











        final List<PackageInfo> result = new ArrayList<>();







        final List<PackageInfo> result = new ArrayList<>();














        final List<String> apexPackageNames = new ArrayList<>();











        for (ApexInfo apexInfo : apexInfoList.apexInfos) {







        for (ApexInfo apexInfo : apexInfoList.apexInfos) {











            final PackageInfo packageInfo;







            final PackageInfo packageInfo;











            int flags = PackageManager.GET_META_DATA;







            int flags = PackageManager.GET_META_DATA;









@@ -245,9 +244,10 @@ public class StagingManager {









            checkRequiredVersionCode(session, activePackage);







            checkRequiredVersionCode(session, activePackage);











            checkDowngrade(session, activePackage, packageInfo);







            checkDowngrade(session, activePackage, packageInfo);











            result.add(packageInfo);







            result.add(packageInfo);














            apexPackageNames.add(packageInfo.packageName);











        }







        }











        Slog.d(TAG, "Session " + session.sessionId + " has following APEX packages: ["







        Slog.d(TAG, "Session " + session.sessionId + " has following APEX packages: "











                + result.stream().map(p -> p.packageName).collect(Collectors.joining(",")) + "]");







                + apexPackageNames);











        return result;







        return result;











    }







    }






























@@ -313,13 +313,16 @@ public class StagingManager {









            return filter.test(session);







            return filter.test(session);











        }







        }











        synchronized (mStagedSessions) {







        synchronized (mStagedSessions) {











            return !(Arrays.stream(session.getChildSessionIds())







            final int[] childSessionIds = session.getChildSessionIds();














            for (int id : childSessionIds) {











                // Retrieve cached sessions matching ids.







                // Retrieve cached sessions matching ids.











                    .mapToObj(i -> mStagedSessions.get(i))







                final PackageInstallerSession s = mStagedSessions.get(id);











                // Filter only the ones containing APEX.







                // Filter only the ones containing APEX.











                    .filter(childSession -> filter.test(childSession))







                if (filter.test(s)) {











                    .collect(Collectors.toList())







                    return true;











                    .isEmpty());







                }














            }














            return false;











        }







        }











    }







    }






























@@ -669,15 +672,15 @@ public class StagingManager {









            // contain an APK, and with those then create a new multi-package group of sessions,







            // contain an APK, and with those then create a new multi-package group of sessions,











            // carrying over all the session parameters and unmarking them as staged. On commit the







            // carrying over all the session parameters and unmarking them as staged. On commit the











            // sessions will be installed atomically.







            // sessions will be installed atomically.











            final List<PackageInstallerSession> childSessions;







            final List<PackageInstallerSession> childSessions = new ArrayList<>();











            synchronized (mStagedSessions) {







            synchronized (mStagedSessions) {











                childSessions =







                final int[] childSessionIds = session.getChildSessionIds();











                        Arrays.stream(session.getChildSessionIds())







                for (int id : childSessionIds) {











                                // Retrieve cached sessions matching ids.







                    final PackageInstallerSession s = mStagedSessions.get(id);











                                .mapToObj(i -> mStagedSessions.get(i))







                    if (!isApexSession(s)) {











                                // Filter only the ones containing APKs.







                        childSessions.add(s);











                                .filter(childSession -> !isApexSession(childSession))







                    }











                                .collect(Collectors.toList());







                }











            }







            }











            if (childSessions.isEmpty()) {







            if (childSessions.isEmpty()) {











                // APEX-only multi-package staged session, nothing to do.







                // APEX-only multi-package staged session, nothing to do.