diff options
| -rw-r--r-- | core/java/com/android/internal/protolog/ProtoLog.java | 2 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/core/java/com/android/internal/protolog/ProtoLog.java b/core/java/com/android/internal/protolog/ProtoLog.java index 13014bfd7f3b..0118c056d682 100644 --- a/core/java/com/android/internal/protolog/ProtoLog.java +++ b/core/java/com/android/internal/protolog/ProtoLog.java @@ -39,7 +39,9 @@ import com.android.internal.protolog.common.LogLevel; * Methods in this class are stubs, that are replaced by optimised versions by the ProtoLogTool * during build. */ +// LINT.IfChange public class ProtoLog { +// LINT.ThenChange(frameworks/base/tools/protologtool/src/com/android/protolog/tool/ProtoLogTool.kt) // Needs to be set directly otherwise the protologtool tries to transform the method call public static boolean REQUIRE_PROTOLOGTOOL = true; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt index c93e584aff9f..ee6c81a3fa04 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/util/KtProtoLog.kt @@ -21,7 +21,7 @@ import com.android.internal.protolog.common.IProtoLogGroup import com.android.internal.protolog.ProtoLog /** - * Log messages using an API similar to [com.android.internal.protolog.common.ProtoLog]. Useful for + * Log messages using an API similar to [com.android.internal.protolog.ProtoLog]. Useful for * logging from Kotlin classes as ProtoLog does not have support for Kotlin. * * All messages are logged to logcat if logging is enabled for that [IProtoLogGroup]. @@ -29,42 +29,42 @@ import com.android.internal.protolog.ProtoLog // TODO(b/168581922): remove once ProtoLog adds support for Kotlin class KtProtoLog { companion object { - /** @see [com.android.internal.protolog.common.ProtoLog.d] */ + /** @see [com.android.internal.protolog.ProtoLog.d] */ fun d(group: IProtoLogGroup, messageString: String, vararg args: Any) { if (group.isLogToLogcat) { Log.d(group.tag, String.format(messageString, *args)) } } - /** @see [com.android.internal.protolog.common.ProtoLog.v] */ + /** @see [com.android.internal.protolog.ProtoLog.v] */ fun v(group: IProtoLogGroup, messageString: String, vararg args: Any) { if (group.isLogToLogcat) { Log.v(group.tag, String.format(messageString, *args)) } } - /** @see [com.android.internal.protolog.common.ProtoLog.i] */ + /** @see [com.android.internal.protolog.ProtoLog.i] */ fun i(group: IProtoLogGroup, messageString: String, vararg args: Any) { if (group.isLogToLogcat) { Log.i(group.tag, String.format(messageString, *args)) } } - /** @see [com.android.internal.protolog.common.ProtoLog.w] */ + /** @see [com.android.internal.protolog.ProtoLog.w] */ fun w(group: IProtoLogGroup, messageString: String, vararg args: Any) { if (group.isLogToLogcat) { Log.w(group.tag, String.format(messageString, *args)) } } - /** @see [com.android.internal.protolog.common.ProtoLog.e] */ + /** @see [com.android.internal.protolog.ProtoLog.e] */ fun e(group: IProtoLogGroup, messageString: String, vararg args: Any) { if (group.isLogToLogcat) { Log.e(group.tag, String.format(messageString, *args)) } } - /** @see [com.android.internal.protolog.common.ProtoLog.wtf] */ + /** @see [com.android.internal.protolog.ProtoLog.wtf] */ fun wtf(group: IProtoLogGroup, messageString: String, vararg args: Any) { if (group.isLogToLogcat) { Log.wtf(group.tag, String.format(messageString, *args)) |