PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Validate ringtone URIs before setting" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-11-08 18:05:31 +00:00
committed by Android (Google) Code Review
parent 91233dd150 1876c44991
commit 410fe2f16e
4 changed files with 172 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/app/NotificationSoundPreference.java
View File

@@ -25,10 +25,13 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.util.AttributeSet;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
public class NotificationSoundPreference extends RingtonePreference {
private static final String TAG = "NotificationSoundPreference";
private Uri mRingtone;
public NotificationSoundPreference(Context context, AttributeSet attrs) {
@@ -50,8 +53,13 @@ public class NotificationSoundPreference extends RingtonePreference {
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
if (data != null) {
Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
setRingtone(uri);
callChangeListener(uri);
if (isValidRingtoneUri(uri)) {
setRingtone(uri);
callChangeListener(uri);
} else {
Log.e(TAG, "onActivityResult for URI:" + uri
+ " ignored: invalid ringtone Uri");
}
}
return true;