Migrate pullAppOps to new API (97050e1c) · Commits · e / os / android_frameworks_base

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+0 −64

Original line number	Diff line number	Diff line
		@@ -856,65 +856,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		pulledData.add(e);
		}

		private void pullAppOps(long elapsedNanos, final long wallClockNanos,
		List<StatsLogEventWrapper> pulledData) {
		long token = Binder.clearCallingIdentity();
		try {
		AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);

		CompletableFuture<HistoricalOps> ops = new CompletableFuture<>();
		HistoricalOpsRequest histOpsRequest =
		new HistoricalOpsRequest.Builder(0, Long.MAX_VALUE).build();
		appOps.getHistoricalOps(histOpsRequest, mContext.getMainExecutor(), ops::complete);

		HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,
		TimeUnit.MILLISECONDS);

		for (int uidIdx = 0; uidIdx < histOps.getUidCount(); uidIdx++) {
		final HistoricalUidOps uidOps = histOps.getUidOpsAt(uidIdx);
		final int uid = uidOps.getUid();
		for (int pkgIdx = 0; pkgIdx < uidOps.getPackageCount(); pkgIdx++) {
		final HistoricalPackageOps packageOps = uidOps.getPackageOpsAt(pkgIdx);
		for (int opIdx = 0; opIdx < packageOps.getOpCount(); opIdx++) {
		final AppOpsManager.HistoricalOp op = packageOps.getOpAt(opIdx);
		StatsLogEventWrapper e = new StatsLogEventWrapper(StatsLog.APP_OPS,
		elapsedNanos, wallClockNanos);

		e.writeInt(uid);
		e.writeString(packageOps.getPackageName());
		e.writeInt(op.getOpCode());
		e.writeLong(op.getForegroundAccessCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getBackgroundAccessCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getForegroundRejectCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getBackgroundRejectCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getForegroundAccessDuration(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getBackgroundAccessDuration(OP_FLAGS_ALL_TRUSTED));

		String perm = AppOpsManager.opToPermission(op.getOpCode());
		if (perm == null) {
		e.writeBoolean(false);
		} else {
		PermissionInfo permInfo;
		try {
		permInfo = mContext.getPackageManager().getPermissionInfo(perm, 0);
		e.writeBoolean(permInfo.getProtection() == PROTECTION_DANGEROUS);
		} catch (PackageManager.NameNotFoundException exception) {
		e.writeBoolean(false);
		}
		}

		pulledData.add(e);
		}
		}
		}
		} catch (Throwable t) {
		Log.e(TAG, "Could not read appops", t);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}


		/**
		* Add a RoleHolder atom for each package that holds a role.
		*
		@@ -1134,11 +1075,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub {
		break;
		}

		case StatsLog.APP_OPS: {
		pullAppOps(elapsedNanos, wallClockNanos, ret);
		break;
		}

		default:
		Slog.w(TAG, "No such tagId data as " + tagId);
		return null;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -133,10 +133,6 @@ std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = {
		{{.atomTag = android::util::FACE_SETTINGS},
		{.puller = new StatsCompanionServicePuller(android::util::FACE_SETTINGS)}},

		// App ops
		{{.atomTag = android::util::APP_OPS},
		{.puller = new StatsCompanionServicePuller(android::util::APP_OPS)}},

		// VmsClientStats
		{{.atomTag = android::util::VMS_CLIENT_STATS},
		{.additiveFields = {5, 6, 7, 8, 9, 10},

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+66 −3

Original line number	Diff line number	Diff line
		@@ -2363,11 +2363,74 @@ public class StatsPullAtomService extends SystemService {
		}

		private void registerAppOps() {
		// No op.
		int tagId = StatsLog.APP_OPS;
		mStatsManager.registerPullAtomCallback(
		tagId,
		null, // use default PullAtomMetadata values
		(atomTag, data) -> pullAppOps(atomTag, data),
		BackgroundThread.getExecutor()
		);

		}

		private void pullAppOps() {
		// No op.
		private int pullAppOps(int atomTag, List<StatsEvent> pulledData) {
		long token = Binder.clearCallingIdentity();
		try {
		AppOpsManager appOps = mContext.getSystemService(AppOpsManager.class);

		CompletableFuture<HistoricalOps> ops = new CompletableFuture<>();
		HistoricalOpsRequest histOpsRequest =
		new HistoricalOpsRequest.Builder(0, Long.MAX_VALUE).build();
		appOps.getHistoricalOps(histOpsRequest, mContext.getMainExecutor(), ops::complete);

		HistoricalOps histOps = ops.get(EXTERNAL_STATS_SYNC_TIMEOUT_MILLIS,
		TimeUnit.MILLISECONDS);

		for (int uidIdx = 0; uidIdx < histOps.getUidCount(); uidIdx++) {
		final HistoricalUidOps uidOps = histOps.getUidOpsAt(uidIdx);
		final int uid = uidOps.getUid();
		for (int pkgIdx = 0; pkgIdx < uidOps.getPackageCount(); pkgIdx++) {
		final HistoricalPackageOps packageOps = uidOps.getPackageOpsAt(pkgIdx);
		for (int opIdx = 0; opIdx < packageOps.getOpCount(); opIdx++) {
		final AppOpsManager.HistoricalOp op = packageOps.getOpAt(opIdx);

		StatsEvent.Builder e = StatsEvent.newBuilder();
		e.setAtomId(atomTag);
		e.writeInt(uid);
		e.writeString(packageOps.getPackageName());
		e.writeInt(op.getOpCode());
		e.writeLong(op.getForegroundAccessCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getBackgroundAccessCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getForegroundRejectCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getBackgroundRejectCount(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getForegroundAccessDuration(OP_FLAGS_ALL_TRUSTED));
		e.writeLong(op.getBackgroundAccessDuration(OP_FLAGS_ALL_TRUSTED));

		String perm = AppOpsManager.opToPermission(op.getOpCode());
		if (perm == null) {
		e.writeBoolean(false);
		} else {
		PermissionInfo permInfo;
		try {
		permInfo = mContext.getPackageManager().getPermissionInfo(perm, 0);
		e.writeBoolean(permInfo.getProtection() == PROTECTION_DANGEROUS);
		} catch (PackageManager.NameNotFoundException exception) {
		e.writeBoolean(false);
		}
		}

		pulledData.add(e.build());
		}
		}
		}
		} catch (Throwable t) {
		// TODO: catch exceptions at a more granular level
		Slog.e(TAG, "Could not read appops", t);
		return StatsManager.PULL_SKIP;
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		return StatsManager.PULL_SUCCESS;
		}

		static void unpackStreamedData(int atomTag, List<StatsEvent> pulledData,