Merge "Add shell cmd blob_store idle-maintenance." into rvc-dev am: 29c8617d36... (b8b0548b) · Commits · e / os / android_frameworks_base

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -939,6 +939,12 @@ public class BlobStoreManagerService extends SystemService {
	}		}
	}		}

			void runIdleMaintenance() {
			synchronized (mBlobsLock) {
			handleIdleMaintenanceLocked();
			}
			}

	@GuardedBy("mBlobsLock")		@GuardedBy("mBlobsLock")
	private void dumpSessionsLocked(IndentingPrintWriter fout, DumpArgs dumpArgs) {		private void dumpSessionsLocked(IndentingPrintWriter fout, DumpArgs dumpArgs) {
	for (int i = 0, userCount = mSessions.size(); i < userCount; ++i) {		for (int i = 0, userCount = mSessions.size(); i < userCount; ++i) {
	@@ -1408,9 +1414,7 @@ public class BlobStoreManagerService extends SystemService {
	private class LocalService extends BlobStoreManagerInternal {		private class LocalService extends BlobStoreManagerInternal {
	@Override		@Override
	public void onIdleMaintenance() {		public void onIdleMaintenance() {
	synchronized (mBlobsLock) {		runIdleMaintenance();
	handleIdleMaintenanceLocked();
	}
	}		}
	}		}

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,8 @@ class BlobStoreManagerShellCommand extends ShellCommand {
	return runClearAllBlobs(pw);		return runClearAllBlobs(pw);
	case "delete-blob":		case "delete-blob":
	return runDeleteBlob(pw);		return runDeleteBlob(pw);
			case "idle-maintenance":
			return runIdleMaintenance(pw);
	default:		default:
	return handleDefaultCommands(cmd);		return handleDefaultCommands(cmd);
	}		}
	@@ -84,6 +86,11 @@ class BlobStoreManagerShellCommand extends ShellCommand {
	return 0;		return 0;
	}		}

			private int runIdleMaintenance(PrintWriter pw) {
			mService.runIdleMaintenance();
			return 0;
			}

	@Override		@Override
	public void onHelp() {		public void onHelp() {
	final PrintWriter pw = getOutPrintWriter();		final PrintWriter pw = getOutPrintWriter();
	@@ -112,6 +119,8 @@ class BlobStoreManagerShellCommand extends ShellCommand {
	pw.println(" --expiry: Expiry time of the blob to delete, in milliseconds.");		pw.println(" --expiry: Expiry time of the blob to delete, in milliseconds.");
	pw.println(" --label: Label of the blob to delete.");		pw.println(" --label: Label of the blob to delete.");
	pw.println(" --tag: Tag of the blob to delete.");		pw.println(" --tag: Tag of the blob to delete.");
			pw.println("idle-maintenance");
			pw.println(" Run idle maintenance which takes care of removing stale data.");
	pw.println();		pw.println();
	}		}