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

Commit 2948af37 authored by Josh Guilfoyle's avatar Josh Guilfoyle
Browse files

ESPRESSO-663: Revert "Added RINGTONE_CHANGED broadcast"

This reverts commit 5257f6d2.

Conflicts:

	media/java/android/media/RingtoneManager.java

CR: Dirk Sigurdson
CR: Ed Carrigan
parent b45856f9
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
import android.net.Uri;
@@ -53,11 +52,6 @@ public class RingtoneManager {

    private static final String TAG = "RingtoneManager";

    /**
     * @hide
     */
    public static final String ACTION_RINGTONE_CHANGED = "com.tmobile.intent.action.RINGTONE_CHANGED";

    // Make sure these are in sync with attrs.xml:
    // <attr name="ringtoneType">
    
@@ -693,10 +687,6 @@ public class RingtoneManager {
        if (setting == null) return;
        Settings.System.putString(context.getContentResolver(), setting,
                ringtoneUri != null ? ringtoneUri.toString() : null);
        Intent intent = new Intent();
        intent.setAction(ACTION_RINGTONE_CHANGED);
        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, type);
        context.sendBroadcast(intent);
    }
    
    private static String getSettingForType(int type) {