commit 23cf724a9895661995f47cf78298aa9ae9fe0c92
author Stephen Crane <cranes@google.com> Wed Jan 19 17:49:46 2022 +0000
committer Stephen Crane <cranes@google.com> Wed Jan 19 09:59:17 2022 -0800
tree 36038ec2c8617f4c97b5c2507761465deabca8dc
parent 23504a190eebba5e5fa5400d1f574f3ea8f76220

Revert^2 "[keystore2] Fix binder import path"

Import from the binder crate root instead of binder::public_api for
compatibility with the new crate structure.

Original change: Ia9695e5493bda965ca9a42989ec5a284407595ce

Test: m
Bug: 196056781

Change-Id: Ie6303a36a956cf73f317520a0e0a00ec4adbb47e

keystore2/src/authorization.rs

diff --git a/keystore2/src/authorization.rs b/keystore2/src/authorization.rs
index 04626bc..516a860 100644
--- a/keystore2/src/authorization.rs
+++ b/keystore2/src/authorization.rs
@@ -265,7 +265,7 @@
         challenge: i64,
         secure_user_id: i64,
         auth_token_max_age_millis: i64,
-    ) -> binder::public_api::Result<AuthorizationTokens> {
+    ) -> binder::Result<AuthorizationTokens> {
         let _wp = wd::watch_millis("IKeystoreAuthorization::getAuthTokensForCredStore", 500);
         map_or_log_err(
             self.get_auth_tokens_for_credstore(