Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cebe3dd1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use public android.system.Int64Ref instead of Int32Ref which is hidden... 

Merge "Use public android.system.Int64Ref instead of Int32Ref which is hidden (CorePlatformApi) type of libcore"
parents cac48853 734ab490

core/java/android/content/ContentResolver.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ import android.os.RemoteException; 
import android.os.ServiceManager;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserHandle;

import android.system.Int32Ref;

import android.system.Int64Ref;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;
@@ -4050,7 +4050,7 @@ public abstract class ContentResolver implements ContentInterface { 
        // Convert to Point, since that's what the API is defined as

        // Convert to Point, since that's what the API is defined as

        final Bundle opts = new Bundle();

        final Bundle opts = new Bundle();

        opts.putParcelable(EXTRA_SIZE, new Point(size.getWidth(), size.getHeight()));

        opts.putParcelable(EXTRA_SIZE, new Point(size.getWidth(), size.getHeight()));

        final Int32Ref orientation = new Int32Ref(0);

        final Int64Ref orientation = new Int64Ref(0);





        Bitmap bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(() -> {

        Bitmap bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(() -> {

            final AssetFileDescriptor afd = content.openTypedAssetFile(uri, "image/*", opts,

            final AssetFileDescriptor afd = content.openTypedAssetFile(uri, "image/*", opts,