From ef11c20f98a2a7e98e9453b9075d1cc0d9af5ce9 Mon Sep 17 00:00:00 2001 From: Samuel Freilich Date: Thu, 21 May 2026 08:28:02 -0700 Subject: [PATCH] Be consistent about converting status to error message Like `ink::jni::ThrowExceptionFromStatus`, use `absl::Status::ToString`, which includes a prefix representing the status code, instead of `absl::Status::message`, which does not. PiperOrigin-RevId: 919064763 --- ink/brush/internal/jni/brush_behavior_native.cc | 2 +- ink/brush/internal/jni/brush_behavior_node_native.cc | 2 +- ink/brush/internal/jni/brush_family_native.cc | 2 +- ink/brush/internal/jni/brush_native.cc | 2 +- ink/brush/internal/jni/brush_paint_native.cc | 8 ++++---- ink/brush/internal/jni/brush_tip_native.cc | 2 +- ink/brush/internal/jni/easing_function_native.cc | 2 +- ink/strokes/internal/jni/stroke_input_batch_native.cc | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ink/brush/internal/jni/brush_behavior_native.cc b/ink/brush/internal/jni/brush_behavior_native.cc index 4224aa40..91972d3b 100644 --- a/ink/brush/internal/jni/brush_behavior_native.cc +++ b/ink/brush/internal/jni/brush_behavior_native.cc @@ -63,7 +63,7 @@ int64_t BrushBehaviorNative_createFromOrderedNodes( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeBrushBehavior(std::move(brush_behavior)); diff --git a/ink/brush/internal/jni/brush_behavior_node_native.cc b/ink/brush/internal/jni/brush_behavior_node_native.cc index abf7d183..cc7a6898 100644 --- a/ink/brush/internal/jni/brush_behavior_node_native.cc +++ b/ink/brush/internal/jni/brush_behavior_node_native.cc @@ -37,7 +37,7 @@ int64_t ValidateAndHoistNode(void* jni_env_pass_through, if (absl::Status status = ValidateBrushBehaviorNode(node); !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeBrushBehaviorNode(std::move(node)); diff --git a/ink/brush/internal/jni/brush_family_native.cc b/ink/brush/internal/jni/brush_family_native.cc index d64f4317..9f300f4d 100644 --- a/ink/brush/internal/jni/brush_family_native.cc +++ b/ink/brush/internal/jni/brush_family_native.cc @@ -97,7 +97,7 @@ int64_t BrushFamilyNative_create( if (!brush_family.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(brush_family.status().code()), - brush_family.status().message().data()); + brush_family.status().ToString().c_str()); return 0; } diff --git a/ink/brush/internal/jni/brush_native.cc b/ink/brush/internal/jni/brush_native.cc index 8e88478b..f0f83596 100644 --- a/ink/brush/internal/jni/brush_native.cc +++ b/ink/brush/internal/jni/brush_native.cc @@ -52,7 +52,7 @@ int64_t BrushNative_create( if (!brush.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(brush.status().code()), - brush.status().message().data()); + brush.status().ToString().c_str()); return 0; } diff --git a/ink/brush/internal/jni/brush_paint_native.cc b/ink/brush/internal/jni/brush_paint_native.cc index 00925b1c..ebc0f0fb 100644 --- a/ink/brush/internal/jni/brush_paint_native.cc +++ b/ink/brush/internal/jni/brush_paint_native.cc @@ -87,7 +87,7 @@ int64_t ValidateAndHoistColorFunctionOrThrow( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeColorFunction(std::move(color_function)); @@ -122,7 +122,7 @@ int64_t BrushPaintNative_create( if (absl::Status status = ValidateBrushPaint(brush_paint); !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeBrushPaint(std::move(brush_paint)); @@ -199,7 +199,7 @@ int64_t TilingTextureNative_create( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeTextureLayer(std::move(texture_layer)); @@ -222,7 +222,7 @@ int64_t StampingTextureNative_create( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeTextureLayer(std::move(texture_layer)); diff --git a/ink/brush/internal/jni/brush_tip_native.cc b/ink/brush/internal/jni/brush_tip_native.cc index 82f55c0b..4474911a 100644 --- a/ink/brush/internal/jni/brush_tip_native.cc +++ b/ink/brush/internal/jni/brush_tip_native.cc @@ -66,7 +66,7 @@ int64_t BrushTipNative_create( if (absl::Status status = ValidateBrushTip(tip); !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeBrushTip(std::move(tip)); diff --git a/ink/brush/internal/jni/easing_function_native.cc b/ink/brush/internal/jni/easing_function_native.cc index 17b9b806..043b40bd 100644 --- a/ink/brush/internal/jni/easing_function_native.cc +++ b/ink/brush/internal/jni/easing_function_native.cc @@ -42,7 +42,7 @@ int64_t ValidateAndHoistEasingFunction( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return 0; } return NewNativeEasingFunction(std::move(easing_function)); diff --git a/ink/strokes/internal/jni/stroke_input_batch_native.cc b/ink/strokes/internal/jni/stroke_input_batch_native.cc index c51ee116..ef629a4a 100644 --- a/ink/strokes/internal/jni/stroke_input_batch_native.cc +++ b/ink/strokes/internal/jni/stroke_input_batch_native.cc @@ -120,7 +120,7 @@ bool MutableStrokeInputBatchNative_appendSingle( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return false; } return true; @@ -136,7 +136,7 @@ bool MutableStrokeInputBatchNative_appendBatch( !status.ok()) { throw_from_status_callback(jni_env_pass_through, static_cast(status.code()), - status.message().data()); + status.ToString().c_str()); return false; } return true;