Merge "Fix lock contention in AppOpsService" into sc-dev (f9cb2f2d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/HistoricalRegistry.java

+15 −16

Original line number	Diff line number	Diff line
		@@ -385,11 +385,10 @@ final class HistoricalRegistry {
		callback.sendResult(new Bundle());
		return;
		}
		}
		mPersistence.collectHistoricalOpsDLocked(result, uid, packageName,
		attributionTag,
		opNames, filter, beginTimeMillis, endTimeMillis, flags);

		}
		}
		}

		@@ -577,6 +576,7 @@ final class HistoricalRegistry {
		Slog.e(LOG_TAG, "Interaction before persistence initialized");
		return;
		}
		}
		final List<HistoricalOps> history = mPersistence.readHistoryDLocked();
		clearHistoricalRegistry();
		if (history != null) {
		@@ -592,7 +592,6 @@ final class HistoricalRegistry {
		}
		}
		}
		}

		void addHistoricalOps(HistoricalOps ops) {
		final List<HistoricalOps> pendingWrites;