Merge "MediaPlayer2: add fallback logic for ringtone default actual uri." (92c09a17) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer2Impl.java

+39 −31

Original line number	Diff line number	Diff line
		@@ -738,43 +738,42 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		@Nullable Map<String, String> headers, @Nullable List<HttpCookie> cookies,
		long startPos, long endPos)
		throws IOException {
		// The context and URI usually belong to the calling user. Get a resolver for that user
		// and strip out the userId from the URI if present.
		// The context and URI usually belong to the calling user. Get a resolver for that user.
		final ContentResolver resolver = context.getContentResolver();
		final String scheme = uri.getScheme();
		final String authority = ContentProvider.getAuthorityWithoutUserId(uri.getAuthority());
		if (ContentResolver.SCHEME_FILE.equals(scheme)) {
		handleDataSource(isCurrent, srcId, uri.getPath(), null, null, startPos, endPos);
		return;
		}

		AssetFileDescriptor afd = null;
		final int ringToneType = RingtoneManager.getDefaultType(uri);
		try {
		AssetFileDescriptor afd;
		// Try requested Uri locally first
		if (ContentResolver.SCHEME_CONTENT.equals(scheme)
		&& Settings.AUTHORITY.equals(authority)) {
		if (ContentResolver.SCHEME_CONTENT.equals(scheme) && ringToneType != -1) {
		afd = RingtoneManager.openDefaultRingtoneUri(context, uri);
		if (attemptDataSource(isCurrent, srcId, afd, startPos, endPos)) {
		return;
		}
		final Uri actualUri = RingtoneManager.getActualDefaultRingtoneUri(
		context, ringToneType);
		afd = resolver.openAssetFileDescriptor(actualUri, "r");
		} else {
		afd = resolver.openAssetFileDescriptor(uri, "r");
		}
		if (afd != null) {
		handleDataSource(isCurrent, srcId, afd, startPos, endPos);
		if (attemptDataSource(isCurrent, srcId, afd, startPos, endPos)) {
		return;
		}
		} catch (NullPointerException \| SecurityException \| IOException ex) {
		Log.w(TAG, "Couldn't open " + uri + ": " + ex);
		// Fallback to media server
		} finally {
		if (afd != null) {
		afd.close();
		}
		}
		handleDataSource(isCurrent, srcId, uri.toString(), headers, cookies, startPos, endPos);
		}

		private void handleDataSource(boolean isCurrent, long srcId, AssetFileDescriptor afd,
		long startPos, long endPos)
		throws IOException {
		private boolean attemptDataSource(boolean isCurrent, long srcId, AssetFileDescriptor afd,
		long startPos, long endPos) throws IOException {
		try {
		if (afd.getDeclaredLength() < 0) {
		handleDataSource(isCurrent,
		srcId,
		@@ -792,6 +791,15 @@ public final class MediaPlayer2Impl extends MediaPlayer2 {
		startPos,
		endPos);
		}
		return true;
		} catch (NullPointerException \| SecurityException \| IOException ex) {
		Log.w(TAG, "Couldn't open srcId:" + srcId + ": " + ex);
		return false;
		} finally {
		if (afd != null) {
		afd.close();
		}
		}
		}

		private void handleDataSource(