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

Commit 7a210aae authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip unnecessary IPC when getting VibrationEffect." into rvc-dev am: 60e19c76 

Change-Id: I821935910bcce398b60e73f2c37e02c8a8a42307
parents 57ebd41d 60e19c76

core/java/android/os/VibrationEffect.java

+9 −2
Original line number Diff line number Diff line
@@ -343,6 +343,14 @@ public abstract class VibrationEffect implements Parcelable { 
    @TestApi

    @Nullable

    public static VibrationEffect get(Uri uri, Context context) {

        String[] uris = context.getResources().getStringArray(

                com.android.internal.R.array.config_ringtoneEffectUris);



        // Skip doing any IPC if we don't have any effects configured.

        if (uris.length == 0) {

            return null;

        }



        final ContentResolver cr = context.getContentResolver();

        Uri uncanonicalUri = cr.uncanonicalize(uri);

        if (uncanonicalUri == null) {
@@ -351,8 +359,7 @@ public abstract class VibrationEffect implements Parcelable { 
            // place.

            uncanonicalUri = uri;

        }

        String[] uris = context.getResources().getStringArray(

                com.android.internal.R.array.config_ringtoneEffectUris);



        for (int i = 0; i < uris.length && i < RINGTONES.length; i++) {

            if (uris[i] == null) {

                continue;