Merge "Uncanonicalize URIs before comparing them." (6c1c5be8) · Commits · e / os / android_frameworks_base

core/java/android/os/VibrationEffect.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.os;

		import android.annotation.Nullable;
		import android.annotation.TestApi;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.hardware.vibrator.V1_0.EffectStrength;
		import android.hardware.vibrator.V1_2.Effect;
		@@ -277,7 +278,12 @@ public abstract class VibrationEffect implements Parcelable {
		if (uris[i] == null) {
		continue;
		}
		if (Uri.parse(uris[i]).equals(uri)) {
		ContentResolver cr = context.getContentResolver();
		Uri mappedUri = cr.uncanonicalize(Uri.parse(uris[i]));
		if (mappedUri == null) {
		continue;
		}
		if (mappedUri.equals(uri)) {
		return get(RINGTONES[i]);
		}
		}