Merge "When scanning a single file, take .nomedia into account"

            // always scan the file, so we can return the content://media Uri for existing files

            return mClient.doScanFile(path, mimeType, lastModifiedSeconds, file.length(),

                    false, true, false);

                    false, true, MediaScanner.isNoMediaPath(path));

        } catch (RemoteException e) {

            Log.e(TAG, "RemoteException in MediaScanner.scanFile()", e);

            return null;