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

Merge "Per-uid timeouts." into sc-dev am: 1c17e60f4c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13436051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I022b0f11d93021abade4d67d88e4dc96c909dec3
This commit is contained in:
TreeHugger Robot
2021-01-29 18:30:10 +00:00
committed by Automerger Merge Worker
parent f4fe6c9f60 1c17e60f4c
commit b2e166d3d4
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -28352,6 +28352,13 @@ public class PackageManagerService extends IPackageManager.Stub
} }
continue; continue;
} }
if (ps.appId < Process.FIRST_APPLICATION_UID) {
if (DEBUG_PER_UID_READ_TIMEOUTS) {
Slog.i(TAG, "PerUidReadTimeouts: package is system, appId=" + ps.appId);
}
continue;
}
final AndroidPackage pkg = ps.getPkg(); final AndroidPackage pkg = ps.getPkg();
if (pkg.getLongVersionCode() < perPackage.versionCodes.minVersionCode if (pkg.getLongVersionCode() < perPackage.versionCodes.minVersionCode
|| pkg.getLongVersionCode() > perPackage.versionCodes.maxVersionCode) { || pkg.getLongVersionCode() > perPackage.versionCodes.maxVersionCode) {

12
services/incremental/ServiceWrappers.cpp
View File

@@ -210,7 +210,17 @@ public:
ErrorCode setUidReadTimeouts(const Control& control, ErrorCode setUidReadTimeouts(const Control& control,
const std::vector<android::os::incremental::PerUidReadTimeouts>& const std::vector<android::os::incremental::PerUidReadTimeouts>&
perUidReadTimeouts) const final { perUidReadTimeouts) const final {
return -ENOTSUP; std::vector<incfs::UidReadTimeouts> timeouts;
timeouts.resize(perUidReadTimeouts.size());
for (int i = 0, size = perUidReadTimeouts.size(); i < size; ++i) {
auto&& timeout = timeouts[i];
const auto& perUidTimeout = perUidReadTimeouts[i];
timeout.uid = perUidTimeout.uid;
timeout.minTimeUs = perUidTimeout.minTimeUs;
timeout.minPendingTimeUs = perUidTimeout.minPendingTimeUs;
timeout.maxPendingTimeUs = perUidTimeout.maxPendingTimeUs;
}
return incfs::setUidReadTimeouts(control, timeouts);
} }
}; };