commit 7a223fbcf1a56a67931afb13eaf2445fb71dec43
author Dmitri Plotnikov <dplotnikov@google.com> Fri Feb 14 17:04:13 2020 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Wed Feb 19 11:58:26 2020 -0800
tree 808d7b7ad9f6ceef0e140ad574b082c36b03da39
parent 80fedffc34d7e7acd545abad11b9c898f2e2e000

Add async version of "canonicalize"

Fixes: b/147699082
Test: atest FrameworksCoreTests:android.content.ContentResolverTest
Change-Id: I2e851839a454ad5eabc981c76774d03b57a1aa09

core/java/android/content/ContentProvider.java

diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index e1942da..bd3298c 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -580,6 +580,15 @@
         }
 
         @Override
+        public void canonicalizeAsync(String callingPkg, @Nullable String featureId, Uri uri,
+                RemoteCallback callback) {
+            final Bundle result = new Bundle();
+            result.putParcelable(ContentResolver.REMOTE_CALLBACK_RESULT,
+                    canonicalize(callingPkg, featureId, uri));
+            callback.sendResult(result);
+        }
+
+        @Override
         public Uri uncanonicalize(String callingPkg, String featureId,  Uri uri) {
             uri = validateIncomingUri(uri);
             int userId = getUserIdFromUri(uri);