Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MS29] Remove Trace hidden API dependencies" am: be70a4353a am: 56da05be6c am: e987d6eb82

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952201

Change-Id: I34899dff6aa29ef5940afce89d459d2585d97044
This commit is contained in:
Treehugger Robot
2022-01-21 09:07:35 +00:00
committed by Automerger Merge Worker
parent c7e673cb90 e987d6eb82
commit db6062fa8d
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/api/module-lib-current.txt
View File

@@ -384,6 +384,16 @@ package android.os {
method @NonNull public java.util.List<android.content.ComponentName> getEnabledComponentOverrides(@NonNull String); method @NonNull public java.util.List<android.content.ComponentName> getEnabledComponentOverrides(@NonNull String);
} }
public final class Trace {
method public static void asyncTraceBegin(long, @NonNull String, int);
method public static void asyncTraceEnd(long, @NonNull String, int);
method public static boolean isTagEnabled(long);
method public static void traceBegin(long, @NonNull String);
method public static void traceCounter(long, @NonNull String, int);
method public static void traceEnd(long);
field public static final long TRACE_TAG_NETWORK = 2097152L; // 0x200000L
}
} }
package android.os.storage { package android.os.storage {

18
core/java/android/os/Trace.java
View File

@@ -16,7 +16,10 @@
package android.os; package android.os;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.CriticalNative;
@@ -90,6 +93,7 @@ public final class Trace {
/** @hide */ /** @hide */
public static final long TRACE_TAG_DATABASE = 1L << 20; public static final long TRACE_TAG_DATABASE = 1L << 20;
/** @hide */ /** @hide */
@SystemApi(client = MODULE_LIBRARIES)
public static final long TRACE_TAG_NETWORK = 1L << 21; public static final long TRACE_TAG_NETWORK = 1L << 21;
/** @hide */ /** @hide */
public static final long TRACE_TAG_ADB = 1L << 22; public static final long TRACE_TAG_ADB = 1L << 22;
@@ -148,6 +152,7 @@ public final class Trace {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
public static boolean isTagEnabled(long traceTag) { public static boolean isTagEnabled(long traceTag) {
long tags = nativeGetEnabledTags(); long tags = nativeGetEnabledTags();
return (tags & traceTag) != 0; return (tags & traceTag) != 0;
@@ -163,7 +168,8 @@ public final class Trace {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public static void traceCounter(long traceTag, String counterName, int counterValue) { @SystemApi(client = MODULE_LIBRARIES)
public static void traceCounter(long traceTag, @NonNull String counterName, int counterValue) {
if (isTagEnabled(traceTag)) { if (isTagEnabled(traceTag)) {
nativeTraceCounter(traceTag, counterName, counterValue); nativeTraceCounter(traceTag, counterName, counterValue);
} }
@@ -202,7 +208,8 @@ public final class Trace {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public static void traceBegin(long traceTag, String methodName) { @SystemApi(client = MODULE_LIBRARIES)
public static void traceBegin(long traceTag, @NonNull String methodName) {
if (isTagEnabled(traceTag)) { if (isTagEnabled(traceTag)) {
nativeTraceBegin(traceTag, methodName); nativeTraceBegin(traceTag, methodName);
} }
@@ -217,6 +224,7 @@ public final class Trace {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
@SystemApi(client = MODULE_LIBRARIES)
public static void traceEnd(long traceTag) { public static void traceEnd(long traceTag) {
if (isTagEnabled(traceTag)) { if (isTagEnabled(traceTag)) {
nativeTraceEnd(traceTag); nativeTraceEnd(traceTag);
@@ -237,7 +245,8 @@ public final class Trace {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public static void asyncTraceBegin(long traceTag, String methodName, int cookie) { @SystemApi(client = MODULE_LIBRARIES)
public static void asyncTraceBegin(long traceTag, @NonNull String methodName, int cookie) {
if (isTagEnabled(traceTag)) { if (isTagEnabled(traceTag)) {
nativeAsyncTraceBegin(traceTag, methodName, cookie); nativeAsyncTraceBegin(traceTag, methodName, cookie);
} }
@@ -255,7 +264,8 @@ public final class Trace {
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage
public static void asyncTraceEnd(long traceTag, String methodName, int cookie) { @SystemApi(client = MODULE_LIBRARIES)
public static void asyncTraceEnd(long traceTag, @NonNull String methodName, int cookie) {
if (isTagEnabled(traceTag)) { if (isTagEnabled(traceTag)) {
nativeAsyncTraceEnd(traceTag, methodName, cookie); nativeAsyncTraceEnd(traceTag, methodName, cookie);
} }