Merge "Work around AM ContentObserver timing issue" (76e7d4d5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -19397,6 +19397,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		/**
		* Force the settings cache to be loaded
		*/
		void refreshSettingsCache() {
		mCoreSettingsObserver.onChange(true);
		}

		/**
		* Kill processes for the user with id userId and that depend on the package named packageName
		*/

+7 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,8 @@ final class ActivityManagerShellCommand extends ShellCommand {
		return runWaitForBroadcastIdle(pw);
		case "compat":
		return runCompat(pw);
		case "refresh-settings-cache":
		return runRefreshSettingsCache();
		default:
		return handleDefaultCommands(cmd);
		}
		@@ -2940,6 +2942,11 @@ final class ActivityManagerShellCommand extends ShellCommand {
		return 0;
		}

		int runRefreshSettingsCache() throws RemoteException {
		mInternal.refreshSettingsCache();
		return 0;
		}

		private int runCompat(PrintWriter pw) throws RemoteException {
		final PlatformCompat platformCompat = (PlatformCompat)
		ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE);