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

Commit fa996c9f authored by Lais Andrade's avatar Lais Andrade Committed by Automerger Merge Worker
Browse files

Merge "Use string from EXTRA_RINGTONE_TITLE SoundPicker intent" into main am:... 

Merge "Use string from EXTRA_RINGTONE_TITLE SoundPicker intent" into main am: ca6f6d5f am: 2e07b93f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3102197



Change-Id: Idf50eb44af9e021b9036c82095c161fabbbbb6e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6004db9 2e07b93f

packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.provider.MediaStore;

import android.provider.Settings;

import android.text.Html;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;
@@ -253,6 +254,9 @@ public final class RingtonePickerActivity extends AlertActivity implements 
            } else {

                p.mTitle = getString(com.android.internal.R.string.ringtone_picker_title);

            }

        } else {

            // Make sure intents don't inject HTML elements.

            p.mTitle = Html.escapeHtml(p.mTitle.toString());

        }



        setupAlert();