Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd02d45b authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Uncanonicalize URIs before comparing them." into pi-dev 

am: 467a831a

Change-Id: Ibe0197543af68f937baa4dae768bbc64d34370e4
parents 5cfff2d0 467a831a

core/java/android/os/VibrationEffect.java

+7 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.os;



import android.annotation.Nullable;

import android.content.ContentResolver;

import android.content.Context;

import android.hardware.vibrator.V1_0.EffectStrength;

import android.hardware.vibrator.V1_2.Effect;
@@ -275,7 +276,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]);

            }

        }