From 3f22cb1106019a85bbd059496c20d148a11d6d23 Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Wed, 27 Jan 2021 13:47:15 +0000 Subject: [PATCH] Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore Bug: 154796679 Bug: 179703584 Test: Treehugger Change-Id: I06aa9df929abb94f1d9354f57087a973be597a43 Merged-In: I06aa9df929abb94f1d9354f57087a973be597a43 (cherry picked from commit 734ab4902b131b9cb15fa56c8d427909f1a1b2a8) --- core/java/android/content/ContentResolver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index a6089c31b140a..32aa0377cd5fd 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -64,7 +64,7 @@ import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; import android.os.storage.StorageManager; -import android.system.Int32Ref; +import android.system.Int64Ref; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; @@ -4040,7 +4040,7 @@ public abstract class ContentResolver implements ContentInterface { // Convert to Point, since that's what the API is defined as final Bundle opts = new Bundle(); opts.putParcelable(EXTRA_SIZE, Point.convert(size)); - final Int32Ref orientation = new Int32Ref(0); + final Int64Ref orientation = new Int64Ref(0); Bitmap bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(() -> { final AssetFileDescriptor afd = content.openTypedAssetFile(uri, "image/*", opts,