commit ce2aa0ef49158d0d45fb133fd42ab1deff210f8c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Mar 24 18:46:16 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Mar 24 18:46:16 2025 -0700
tree 3e43e1af80c9f6ef49e07bf45ba9c5025ede031b
parent fd5e51a23e452f7f1be2df338ba4837d6762fc42
parent f8e2f9dad2be97a039a7e3d80c0e325683455c15

Snap for 13264465 from f8e2f9dad2be97a039a7e3d80c0e325683455c15 to 25Q2-release

Change-Id: Ic6f36fae918df83b922c84bd0fdfc9648c04e9e8

keystore2/src/operation.rs

diff --git a/keystore2/src/operation.rs b/keystore2/src/operation.rs
index 2d00b6d..0d5e88f 100644
--- a/keystore2/src/operation.rs
+++ b/keystore2/src/operation.rs
@@ -364,13 +364,13 @@
             .lock()
             .unwrap()
             .before_update()
-            .context(ks_err!("Trying to get auth tokens."))?;
+            .context(ks_err!("Trying to get auth tokens for uid {}", self.owner))?;
 
         self.update_outcome(&mut outcome, {
             let _wp = self.watch("Operation::update_aad: calling IKeyMintOperation::updateAad");
             map_km_error(self.km_op.updateAad(aad_input, hat.as_ref(), tst.as_ref()))
         })
-        .context(ks_err!("Update failed."))?;
+        .context(ks_err!("Update failed for uid {}", self.owner))?;
 
         Ok(())
     }
@@ -387,14 +387,14 @@
             .lock()
             .unwrap()
             .before_update()
-            .context(ks_err!("Trying to get auth tokens."))?;
+            .context(ks_err!("Trying to get auth tokens for uid {}", self.owner))?;
 
         let output = self
             .update_outcome(&mut outcome, {
                 let _wp = self.watch("Operation::update: calling IKeyMintOperation::update");
                 map_km_error(self.km_op.update(input, hat.as_ref(), tst.as_ref()))
             })
-            .context(ks_err!("Update failed."))?;
+            .context(ks_err!("Update failed for uid {}", self.owner))?;
 
         if output.is_empty() {
             Ok(None)
@@ -417,7 +417,7 @@
             .lock()
             .unwrap()
             .before_finish()
-            .context(ks_err!("Trying to get auth tokens."))?;
+            .context(ks_err!("Trying to get auth tokens for uid {}", self.owner))?;
 
         let output = self
             .update_outcome(&mut outcome, {
@@ -430,7 +430,7 @@
                     confirmation_token.as_deref(),
                 ))
             })
-            .context(ks_err!("Finish failed."))?;
+            .context(ks_err!("Finish failed for uid {}", self.owner))?;
 
         self.auth_info.lock().unwrap().after_finish().context("In finish.")?;