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

Commit 9c558594 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Simple mask of incoming file mode."

parents 1a842c20 3b1c2545

services/core/java/com/android/server/StorageManagerService.java

+1 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE; 
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;

import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;

import static android.os.ParcelFileDescriptor.MODE_READ_WRITE;

import static android.os.storage.OnObbStateChangeListener.ERROR_ALREADY_MOUNTED;

import static android.os.storage.OnObbStateChangeListener.ERROR_COULD_NOT_MOUNT;
@@ -2876,11 +2875,7 @@ class StorageManagerService extends IStorageManager.Stub 
        Slog.v(TAG, "mountProxyFileDescriptor");



        // We only support a narrow set of incoming mode flags

        if ((mode & MODE_READ_WRITE) == MODE_READ_WRITE) {

            mode = MODE_READ_WRITE;

        } else {

            mode = MODE_READ_ONLY;

        }

        mode &= MODE_READ_WRITE;



        try {

            synchronized (mAppFuseLock) {