Merge "Revert "Revert "Update ContentProvider to use the AM trace tag.""" (d895b85f) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProvider.java

+33 −33

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package android.content;
		import static android.Manifest.permission.INTERACT_ACROSS_USERS;
		import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
		import static android.os.Process.myUserHandle;
		import static android.os.Trace.TRACE_TAG_DATABASE;
		import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

		import static com.android.internal.util.FrameworkStatsLog.GET_TYPE_ACCESSED_WITHOUT_PERMISSION;
		import static com.android.internal.util.FrameworkStatsLog.GET_TYPE_ACCESSED_WITHOUT_PERMISSION__LOCATION__PROVIDER_CHECK_URI_PERMISSION;
		@@ -284,7 +284,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		// Return an empty cursor for all columns.
		return new MatrixCursor(cursor.getColumnNames(), 0);
		}
		traceBegin(TRACE_TAG_DATABASE, "query: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "query: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -295,7 +295,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -304,7 +304,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		// getCallingPackage() isn't available in getType(), as the javadoc states.
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		traceBegin(TRACE_TAG_DATABASE, "getType: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "getType: ", uri.getAuthority());
		try {
		final String type = mInterface.getType(uri);
		if (type != null) {
		@@ -314,7 +314,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		} finally {
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -395,7 +395,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		setCallingAttributionSource(original);
		}
		}
		traceBegin(TRACE_TAG_DATABASE, "insert: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "insert: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -404,7 +404,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -417,7 +417,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		!= PermissionChecker.PERMISSION_GRANTED) {
		return 0;
		}
		traceBegin(TRACE_TAG_DATABASE, "bulkInsert: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "bulkInsert: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -426,7 +426,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -463,7 +463,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		}
		}
		}
		traceBegin(TRACE_TAG_DATABASE, "applyBatch: ", authority);
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "applyBatch: ", authority);
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -482,7 +482,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -495,7 +495,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		!= PermissionChecker.PERMISSION_GRANTED) {
		return 0;
		}
		traceBegin(TRACE_TAG_DATABASE, "delete: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "delete: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -504,7 +504,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -517,7 +517,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		!= PermissionChecker.PERMISSION_GRANTED) {
		return 0;
		}
		traceBegin(TRACE_TAG_DATABASE, "update: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "update: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -526,7 +526,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -537,7 +537,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		enforceFilePermission(attributionSource, uri, mode);
		traceBegin(TRACE_TAG_DATABASE, "openFile: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "openFile: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -547,7 +547,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -558,7 +558,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		enforceFilePermission(attributionSource, uri, mode);
		traceBegin(TRACE_TAG_DATABASE, "openAssetFile: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "openAssetFile: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -568,7 +568,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -577,7 +577,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		String method, @Nullable String arg, @Nullable Bundle extras) {
		validateIncomingAuthority(authority);
		Bundle.setDefusable(extras, true);
		traceBegin(TRACE_TAG_DATABASE, "call: ", authority);
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "call: ", authority);
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -586,7 +586,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -595,13 +595,13 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		// getCallingPackage() isn't available in getType(), as the javadoc states.
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		traceBegin(TRACE_TAG_DATABASE, "getStreamTypes: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "getStreamTypes: ", uri.getAuthority());
		try {
		return mInterface.getStreamTypes(uri, mimeTypeFilter);
		} catch (RemoteException e) {
		throw e.rethrowAsRuntimeException();
		} finally {
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -613,7 +613,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		enforceFilePermission(attributionSource, uri, "r");
		traceBegin(TRACE_TAG_DATABASE, "openTypedAssetFile: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "openTypedAssetFile: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -623,7 +623,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -641,7 +641,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		!= PermissionChecker.PERMISSION_GRANTED) {
		return null;
		}
		traceBegin(TRACE_TAG_DATABASE, "canonicalize: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "canonicalize: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -650,7 +650,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -677,7 +677,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		!= PermissionChecker.PERMISSION_GRANTED) {
		return null;
		}
		traceBegin(TRACE_TAG_DATABASE, "uncanonicalize: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "uncanonicalize: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -686,7 +686,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -713,7 +713,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		!= PermissionChecker.PERMISSION_GRANTED) {
		return false;
		}
		traceBegin(TRACE_TAG_DATABASE, "refresh: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "refresh: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -721,7 +721,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		CancellationSignal.fromTransport(cancellationSignal));
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@@ -730,7 +730,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		int uid, int modeFlags) {
		uri = validateIncomingUri(uri);
		uri = maybeGetUriWithoutUserId(uri);
		traceBegin(TRACE_TAG_DATABASE, "checkUriPermission: ", uri.getAuthority());
		traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "checkUriPermission: ", uri.getAuthority());
		final AttributionSource original = setCallingAttributionSource(
		attributionSource);
		try {
		@@ -739,7 +739,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
		throw e.rethrowAsRuntimeException();
		} finally {
		setCallingAttributionSource(original);
		Trace.traceEnd(TRACE_TAG_DATABASE);
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}