Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing distribution comparator."

Browse Source
This commit is contained in:
Kweku Adams
2022-02-17 22:17:46 +00:00
committed by Android (Google) Code Review
parent e908fbd93d 1ac63ea72c
commit 3e125abea2
1 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
apex/jobscheduler/service/java/com/android/server/tare/Agent.java
View File

@@ -57,7 +57,6 @@ import com.android.server.utils.AlarmQueue;
import libcore.util.EmptyArray;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
@@ -104,54 +103,6 @@ class Agent {
@GuardedBy("mLock")
private final BalanceThresholdAlarmQueue mBalanceThresholdAlarmQueue;
/**
* Comparator to use to sort apps before we distribute ARCs so that we try to give the most
* important apps ARCs first.
*/
@VisibleForTesting
final Comparator<PackageInfo> mPackageDistributionComparator =
new Comparator<PackageInfo>() {
@Override
public int compare(PackageInfo pi1, PackageInfo pi2) {
final ApplicationInfo appInfo1 = pi1.applicationInfo;
final ApplicationInfo appInfo2 = pi2.applicationInfo;
// Put any packages that don't declare an application at the end. A missing
// <application> tag likely means the app won't be doing any work anyway.
if (appInfo1 == null) {
if (appInfo2 == null) {
return 0;
}
return 1;
} else if (appInfo2 == null) {
return -1;
}
// Privileged apps eat first. They're likely required for the device to
// function properly.
// TODO: include headless system apps
if (appInfo1.isPrivilegedApp()) {
if (!appInfo2.isPrivilegedApp()) {
return -1;
}
} else if (appInfo2.isPrivilegedApp()) {
return 1;
}
// Sort by most recently used.
final long timeSinceLastUsedMs1 =
mAppStandbyInternal.getTimeSinceLastUsedByUser(
pi1.packageName, UserHandle.getUserId(pi1.applicationInfo.uid));
final long timeSinceLastUsedMs2 =
mAppStandbyInternal.getTimeSinceLastUsedByUser(
pi2.packageName, UserHandle.getUserId(pi2.applicationInfo.uid));
if (timeSinceLastUsedMs1 < timeSinceLastUsedMs2) {
return -1;
} else if (timeSinceLastUsedMs1 > timeSinceLastUsedMs2) {
return 1;
}
return 0;
}
};
private static final int MSG_CHECK_BALANCE = 0;
Agent(@NonNull InternalResourceService irs, @NonNull Scribe scribe) {
@@ -668,7 +619,6 @@ class Agent {
@GuardedBy("mLock")
void distributeBasicIncomeLocked(int batteryLevel) {
List<PackageInfo> pkgs = mIrs.getInstalledPackages();
pkgs.sort(mPackageDistributionComparator);
final long now = getCurrentTimeMillis();
for (int i = 0; i < pkgs.size(); ++i) {
@@ -709,8 +659,6 @@ class Agent {
mIrs.getMaxCirculationLocked() / mIrs.getInstalledPackages().size();
final long now = getCurrentTimeMillis();
pkgs.sort(mPackageDistributionComparator);
for (int i = 0; i < pkgs.size(); ++i) {
final PackageInfo packageInfo = pkgs.get(i);
if (!shouldGiveCredits(packageInfo)) {