Merge "Reduce max wait time for package settings write." into main (fd95bcba) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -116,10 +116,19 @@ final class PackageHandler extends Handler {
		}
		} break;
		case WRITE_SETTINGS: {
		mPm.writeSettings(/sync=/false);
		if (!mPm.tryWriteSettings(/sync=/false)) {
		// Failed to write.
		this.removeMessages(WRITE_SETTINGS);
		mPm.scheduleWriteSettings();
		}
		} break;
		case WRITE_PACKAGE_LIST: {
		mPm.writePackageList(msg.arg1);
		int userId = msg.arg1;
		if (!mPm.tryWritePackageList(userId)) {
		// Failed to write.
		this.removeMessages(WRITE_PACKAGE_LIST);
		mPm.scheduleWritePackageList(userId);
		}
		} break;
		case CHECK_PENDING_VERIFICATION: {
		final int verificationId = msg.arg1;

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

+33 −9

Original line number	Diff line number	Diff line
		@@ -489,6 +489,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		*/
		static final long WATCHDOG_TIMEOUT = 10006010; // ten minutes

		// How long to wait for Lock in async writeSettings and writePackageList.
		private static final long WRITE_LOCK_TIMEOUT_MS = 1000 * 10; // 10 seconds

		/**
		* Default IncFs timeouts. Maximum values in IncFs is 1hr.
		*
		@@ -1564,7 +1567,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		}
		}

		private void scheduleWritePackageListLocked(int userId) {
		void scheduleWritePackageList(int userId) {
		invalidatePackageInfoCache();
		if (!mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
		Message msg = mHandler.obtainMessage(WRITE_PACKAGE_LIST);
		@@ -1616,22 +1619,41 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		mSettings.writePackageRestrictions(dirtyUsers);
		}

		void writeSettings(boolean sync) {
		synchronized (mLock) {
		private boolean tryUnderLock(boolean sync, long timeoutMs, Runnable runnable) {
		try {
		if (sync) {
		mLock.lock();
		} else if (!mLock.tryLock(timeoutMs, TimeUnit.MILLISECONDS)) {
		return false;
		}
		try {
		runnable.run();
		return true;
		} finally {
		mLock.unlock();
		}
		} catch (InterruptedException e) {
		Slog.e(TAG, "Failed to obtain mLock", e);
		}
		return false;
		}

		boolean tryWriteSettings(boolean sync) {
		return tryUnderLock(sync, WRITE_LOCK_TIMEOUT_MS, () -> {
		mHandler.removeMessages(WRITE_SETTINGS);
		mBackgroundHandler.removeMessages(WRITE_DIRTY_PACKAGE_RESTRICTIONS);
		writeSettingsLPrTEMP(sync);
		synchronized (mDirtyUsers) {
		mDirtyUsers.clear();
		}
		}
		});
		}

		void writePackageList(int userId) {
		synchronized (mLock) {
		boolean tryWritePackageList(int userId) {
		return tryUnderLock(/sync=/false, WRITE_LOCK_TIMEOUT_MS, () -> {
		mHandler.removeMessages(WRITE_PACKAGE_LIST);
		mSettings.writePackageListLPr(userId);
		}
		});
		}

		private static final Handler.Callback BACKGROUND_HANDLER_CALLBACK = new Handler.Callback() {
		@@ -3056,7 +3078,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		if (mHandler.hasMessages(WRITE_SETTINGS)
		\|\| mBackgroundHandler.hasMessages(WRITE_DIRTY_PACKAGE_RESTRICTIONS)
		\|\| mHandler.hasMessages(WRITE_PACKAGE_LIST)) {
		writeSettings(/sync=/true);
		while (!tryWriteSettings(/sync=/true)) {
		Slog.wtf(TAG, "Failed to write settings on shutdown");
		}
		}
		}
		}
		@@ -4363,7 +4387,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		}
		synchronized (mLock) {
		scheduleWritePackageRestrictions(userId);
		scheduleWritePackageListLocked(userId);
		scheduleWritePackageList(userId);
		mAppsFilter.onUserCreated(snapshotComputer(), userId);
		}
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,9 +16,11 @@

		package com.android.server.pm;

		import java.util.concurrent.locks.ReentrantLock;

		/**
		* This is a unique class that is used as the PackageManager lock. It can be targeted for lock
		* injection, similar to {@link ActivityManagerGlobalLock}.
		*/
		public class PackageManagerTracedLock {
		public class PackageManagerTracedLock extends ReentrantLock {
		}