Merge changes from topics 'List parent profile custom ringtones from managed... (677e2975) · Commits · e / os / android_frameworks_base

media/java/android/media/ExternalRingtonesCursorWrapper.java

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media;

		import android.content.ContentProvider;
		import android.database.Cursor;
		import android.database.CursorWrapper;
		import android.net.Uri;

		/**
		* Cursor that adds the user id to fetched URIs. This is especially useful for {@link getCursor} as
		* a managed profile should also list its parent's ringtones
		*
		* @hide
		*/
		public class ExternalRingtonesCursorWrapper extends CursorWrapper {

		private int mUserId;

		public ExternalRingtonesCursorWrapper(Cursor cursor, int userId) {
		super(cursor);
		mUserId = userId;
		}

		public String getString(int index) {
		String result = super.getString(index);
		if (index == RingtoneManager.URI_COLUMN_INDEX) {
		result = ContentProvider.maybeAddUserId(Uri.parse(result), mUserId).toString();
		}
		return result;
		}
		}

media/java/android/media/RingtoneManager.java

+352 −19

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/Utils.java

+71 −0

Original line number	Diff line number	Diff line
		@@ -16,12 +16,21 @@

		package android.media;

		import android.content.Context;
		import android.content.ContentResolver;
		import android.database.Cursor;
		import android.net.Uri;
		import android.os.Environment;
		import android.os.FileUtils;
		import android.provider.OpenableColumns;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Range;
		import android.util.Rational;
		import android.util.Size;

		import java.io.File;
		import java.io.FileNotFoundException;
		import java.util.Arrays;
		import java.util.Comparator;
		import java.util.Vector;
		@@ -307,4 +316,66 @@ class Utils {
		Log.w(TAG, "could not parse size range '" + o + "'");
		return null;
		}

		/**
		* Creates a unique file in the specified external storage with the desired name. If the name is
		* taken, the new file's name will have '(%d)' to avoid overwriting files.
		*
		* @param context {@link Context} to query the file name from.
		* @param subdirectory One of the directories specified in {@link android.os.Environment}
		* @param fileName desired name for the file.
		* @param mimeType MIME type of the file to create.
		* @return the File object in the storage, or null if an error occurs.
		*/
		public static File getUniqueExternalFile(Context context, String subdirectory, String fileName,
		String mimeType) {
		File externalStorage = Environment.getExternalStoragePublicDirectory(subdirectory);
		// Make sure the storage subdirectory exists
		externalStorage.mkdirs();

		File outFile = null;
		try {
		// Ensure the file has a unique name, as to not override any existing file
		outFile = FileUtils.buildUniqueFile(externalStorage, mimeType, fileName);
		} catch (FileNotFoundException e) {
		// This might also be reached if the number of repeated files gets too high
		Log.e(TAG, "Unable to get a unique file name: " + e);
		return null;
		}
		return outFile;
		}

		/**
		* Returns a file's display name from its {@link android.content.ContentResolver.SCHEME_FILE}
		* or {@link android.content.ContentResolver.SCHEME_CONTENT} Uri. The display name of a file
		* includes its extension.
		*
		* @param context Context trying to resolve the file's display name.
		* @param uri Uri of the file.
		* @return the file's display name, or the uri's string if something fails or the uri isn't in
		* the schemes specified above.
		*/
		static String getFileDisplayNameFromUri(Context context, Uri uri) {
		String scheme = uri.getScheme();

		if (ContentResolver.SCHEME_FILE.equals(scheme)) {
		return uri.getLastPathSegment();
		} else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
		// We need to query the ContentResolver to get the actual file name as the Uri masks it.
		// This means we want the name used for display purposes only.
		String[] proj = {
		OpenableColumns.DISPLAY_NAME
		};
		try (Cursor cursor = context.getContentResolver().query(uri, proj, null, null, null)) {
		if (cursor != null && cursor.getCount() != 0) {
		cursor.moveToFirst();
		return cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
		}
		}
		}

		// This will only happen if the Uri isn't either SCHEME_CONTENT or SCHEME_FILE, so we assume
		// it already represents the file's name.
		return uri.toString();
		}
		}