Merge "Revert "Enforce USB and storage restrictions""

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;

import android.hardware.usb.UsbManager;

import android.app.admin.DevicePolicyManager;

import android.net.Uri;

import android.os.Binder;

import android.os.Environment;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.storage.IMountService;

import android.os.storage.IMountServiceListener;

import android.os.storage.IMountShutdownObserver;

            volume = mVolumesByPath.get(path);

        }

        if (!volume.isEmulated() && hasUserRestriction(UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA)) {

            Slog.w("User has restriction DISALLOW_MOUNT_PHYSICAL_MEDIA; cannot mount volume.");

            return StorageResultCode.OperationFailedInternalError;

        }

        if (DEBUG_EVENTS) Slog.i(TAG, "doMountVolume: Mouting " + path);

        try {

            mConnector.execute("volume", "mount", path);

        }

    }

    private boolean hasUserRestriction(String restriction) {

        UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        return um.hasUserRestriction(restriction, Binder.getCallingUserHandle());

    }

    private void validateUserRestriction(String restriction) {

        if (hasUserRestriction(restriction)) {

            throw new SecurityException("User has restriction " + restriction);

        }

    }

    // Storage list XML tags

    private static final String TAG_STORAGE_LIST = "StorageList";

    private static final String TAG_STORAGE = "storage";

    public void setUsbMassStorageEnabled(boolean enable) {

        waitForReady();

        validatePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS);

        validateUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);

        final StorageVolume primary = getPrimaryPhysicalVolume();

        if (primary == null) return;

    public int mountVolume(String path) {

        validatePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS);

        waitForReady();

        return doMountVolume(path);

    }