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

Commit c80e06ea authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev am: 4315c1e3 

am: 1737e50f

Change-Id: I92766efee7b312e9dd09bc7fcac42850f457a5e9
parents dd6a4331 1737e50f

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -31942,7 +31942,6 @@ package android.os.storage { 
    method public boolean isEncrypted(java.io.File);

    method public boolean isObbMounted(java.lang.String);

    method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);

    method public android.os.ParcelFileDescriptor openProxyFileDescriptor(int, android.os.ProxyFileDescriptorCallback) throws java.io.IOException;

    method public android.os.ParcelFileDescriptor openProxyFileDescriptor(int, android.os.ProxyFileDescriptorCallback, android.os.Handler) throws java.io.IOException;

    method public void setCacheBehaviorGroup(java.io.File, boolean) throws java.io.IOException;

    method public void setCacheBehaviorTombstone(java.io.File, boolean) throws java.io.IOException;

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -34846,7 +34846,6 @@ package android.os.storage { 
    method public boolean isEncrypted(java.io.File);

    method public boolean isObbMounted(java.lang.String);

    method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);

    method public android.os.ParcelFileDescriptor openProxyFileDescriptor(int, android.os.ProxyFileDescriptorCallback) throws java.io.IOException;

    method public android.os.ParcelFileDescriptor openProxyFileDescriptor(int, android.os.ProxyFileDescriptorCallback, android.os.Handler) throws java.io.IOException;

    method public void setCacheBehaviorGroup(java.io.File, boolean) throws java.io.IOException;

    method public void setCacheBehaviorTombstone(java.io.File, boolean) throws java.io.IOException;

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -32075,7 +32075,6 @@ package android.os.storage { 
    method public boolean isEncrypted(java.io.File);

    method public boolean isObbMounted(java.lang.String);

    method public boolean mountObb(java.lang.String, java.lang.String, android.os.storage.OnObbStateChangeListener);

    method public android.os.ParcelFileDescriptor openProxyFileDescriptor(int, android.os.ProxyFileDescriptorCallback) throws java.io.IOException;

    method public android.os.ParcelFileDescriptor openProxyFileDescriptor(int, android.os.ProxyFileDescriptorCallback, android.os.Handler) throws java.io.IOException;

    method public void setCacheBehaviorGroup(java.io.File, boolean) throws java.io.IOException;

    method public void setCacheBehaviorTombstone(java.io.File, boolean) throws java.io.IOException;

core/java/android/os/storage/StorageManager.java

+3 −13
Original line number Diff line number Diff line
@@ -1420,6 +1420,7 @@ public class StorageManager { 
    public @NonNull ParcelFileDescriptor openProxyFileDescriptor(

            int mode, ProxyFileDescriptorCallback callback, Handler handler, ThreadFactory factory)

                    throws IOException {

        Preconditions.checkNotNull(callback);

        MetricsLogger.count(mContext, "storage_open_proxy_file_descriptor", 1);

        // Retry is needed because the mount point mFuseAppLoop is using may be unmounted before

        // invoking StorageManagerService#openProxyFileDescriptor. In this case, we need to re-mount
@@ -1466,19 +1467,7 @@ public class StorageManager { 
        }

    }



    /**

     * Opens seekable ParcelFileDescriptor that routes file operation requests to

     * ProxyFileDescriptorCallback.

     *

     * @param mode The desired access mode, must be one of

     *     {@link ParcelFileDescriptor#MODE_READ_ONLY},

     *     {@link ParcelFileDescriptor#MODE_WRITE_ONLY}, or

     *     {@link ParcelFileDescriptor#MODE_READ_WRITE}

     * @param callback Callback to process file operation requests issued on returned file

     *     descriptor.

     * @return Seekable ParcelFileDescriptor.

     * @throws IOException

     */

    /** {@hide} */

    public @NonNull ParcelFileDescriptor openProxyFileDescriptor(

            int mode, ProxyFileDescriptorCallback callback)

                    throws IOException {
@@ -1502,6 +1491,7 @@ public class StorageManager { 
    public @NonNull ParcelFileDescriptor openProxyFileDescriptor(

            int mode, ProxyFileDescriptorCallback callback, Handler handler)

                    throws IOException {

        Preconditions.checkNotNull(handler);

        return openProxyFileDescriptor(mode, callback, handler, null);

    }