Merge "Per-uid timeouts." into sc-dev (1c17e60f) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -28352,6 +28352,13 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		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();
		if (pkg.getLongVersionCode() < perPackage.versionCodes.minVersionCode
		\|\| pkg.getLongVersionCode() > perPackage.versionCodes.maxVersionCode) {

+11 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,17 @@ public:
		ErrorCode setUidReadTimeouts(const Control& control,
		const std::vector<android::os::incremental::PerUidReadTimeouts>&
		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);
		}
		};