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

Commit 5693cfd1 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Flesh out remaining CR.wrap() methods. 

Along with tests to verify that they're all delegated as expected.

Bug: 129564663
Test: atest cts/tests/tests/content/src/android/content/cts/ContentResolverTest.java
Test: atest cts/tests/tests/content/src/android/content/cts/ContentResolverWrapTest.java
Change-Id: I07dcabb78174ed2bb63061394bf737df71f49bb0
parent 448c1ea8

core/java/android/content/ContentResolver.java

+18 −0
Original line number Diff line number Diff line
@@ -1313,6 +1313,12 @@ public abstract class ContentResolver implements ContentInterface { 
    public final @Nullable ParcelFileDescriptor openFileDescriptor(@NonNull Uri uri,

            @NonNull String mode, @Nullable CancellationSignal cancellationSignal)

                    throws FileNotFoundException {

        try {

            if (mWrapped != null) return mWrapped.openFile(uri, mode, cancellationSignal);

        } catch (RemoteException e) {

            return null;

        }



        AssetFileDescriptor afd = openAssetFileDescriptor(uri, mode, cancellationSignal);

        if (afd == null) {

            return null;
@@ -1455,6 +1461,12 @@ public abstract class ContentResolver implements ContentInterface { 
        Preconditions.checkNotNull(uri, "uri");

        Preconditions.checkNotNull(mode, "mode");



        try {

            if (mWrapped != null) return mWrapped.openAssetFile(uri, mode, cancellationSignal);

        } catch (RemoteException e) {

            return null;

        }



        String scheme = uri.getScheme();

        if (SCHEME_ANDROID_RESOURCE.equals(scheme)) {

            if (!"r".equals(mode)) {
@@ -1634,6 +1646,12 @@ public abstract class ContentResolver implements ContentInterface { 
        Preconditions.checkNotNull(uri, "uri");

        Preconditions.checkNotNull(mimeType, "mimeType");



        try {

            if (mWrapped != null) return mWrapped.openTypedAssetFile(uri, mimeType, opts, cancellationSignal);

        } catch (RemoteException e) {

            return null;

        }



        IContentProvider unstableProvider = acquireUnstableProvider(uri);

        if (unstableProvider == null) {

            throw new FileNotFoundException("No content provider: " + uri);