Remove @CriticalNative annotations (9412f3ce) · Commits · e / os / android_frameworks_base

core/java/android/tracing/perfetto/DataSource.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,6 @@ package android.tracing.perfetto;

	import android.util.proto.ProtoInputStream;		import android.util.proto.ProtoInputStream;

	import dalvik.annotation.optimization.CriticalNative;

	/**		/**
	* Templated base class meant to be derived by embedders to create a custom data		* Templated base class meant to be derived by embedders to create a custom data
	* source.		* source.
	@@ -177,12 +175,8 @@ public abstract class DataSource<DataSourceInstanceType extends DataSourceInstan
	private static native void nativeReleasePerfettoInstanceLocked(		private static native void nativeReleasePerfettoInstanceLocked(
	long dataSourcePtr, int dsInstanceIdx);		long dataSourcePtr, int dsInstanceIdx);

	@CriticalNative
	private static native boolean nativePerfettoDsTraceIterateBegin(long dataSourcePtr);		private static native boolean nativePerfettoDsTraceIterateBegin(long dataSourcePtr);
	@CriticalNative
	private static native boolean nativePerfettoDsTraceIterateNext(long dataSourcePtr);		private static native boolean nativePerfettoDsTraceIterateNext(long dataSourcePtr);
	@CriticalNative
	private static native void nativePerfettoDsTraceIterateBreak(long dataSourcePtr);		private static native void nativePerfettoDsTraceIterateBreak(long dataSourcePtr);
	@CriticalNative
	private static native int nativeGetPerfettoDsInstanceIndex(long dataSourcePtr);		private static native int nativeGetPerfettoDsInstanceIndex(long dataSourcePtr);
	}		}

core/jni/android_tracing_PerfettoDataSource.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -373,22 +373,22 @@ void nativeReleasePerfettoInstanceLocked(JNIEnv* /* env /, jclass / clazz */,
	PerfettoDsImplReleaseInstanceLocked(datasource->dataSource.impl, instance_idx);		PerfettoDsImplReleaseInstanceLocked(datasource->dataSource.impl, instance_idx);
	}		}

	bool nativePerfettoDsTraceIterateBegin(jlong dataSourcePtr) {		bool nativePerfettoDsTraceIterateBegin(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr) {
	sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
	return datasource->TraceIterateBegin();		return datasource->TraceIterateBegin();
	}		}

	bool nativePerfettoDsTraceIterateNext(jlong dataSourcePtr) {		bool nativePerfettoDsTraceIterateNext(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr) {
	sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
	return datasource->TraceIterateNext();		return datasource->TraceIterateNext();
	}		}

	void nativePerfettoDsTraceIterateBreak(jlong dataSourcePtr) {		void nativePerfettoDsTraceIterateBreak(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr) {
	sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
	return datasource->TraceIterateBreak();		return datasource->TraceIterateBreak();
	}		}

	jint nativeGetPerfettoDsInstanceIndex(jlong dataSourcePtr) {		jint nativeGetPerfettoDsInstanceIndex(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr) {
	sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
	return (jint)datasource->GetInstanceIndex();		return (jint)datasource->GetInstanceIndex();
	}		}