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

Commit c4041d9e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33605891'] into 25Q2-release. 

Change-Id: Ied06975019511491518e6d434fef4e99849bfb8f
parents 3449e9e2 f33f9ef6

src/java/com/android/internal/telephony/util/NotificationChannelController.java

+0 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.media.AudioAttributes;

import android.net.Uri;

import android.provider.Settings;

import android.telephony.SubscriptionManager;
@@ -138,7 +137,6 @@ public class NotificationChannelController { 


    /**

     * migrate deprecated voicemail notification settings to initial notification channel settings

     * {@link VoicemailNotificationSettingsUtil#getRingTonePreference(Context)}}

     * {@link VoicemailNotificationSettingsUtil#getVibrationPreference(Context)}

     * notification settings are based on subId, only migrate if sub id matches.

     * otherwise fallback to predefined voicemail channel settings.
@@ -151,10 +149,6 @@ public class NotificationChannelController { 
                NotificationManager.IMPORTANCE_DEFAULT);

        voiceMailChannel.enableVibration(

                VoicemailNotificationSettingsUtil.getVibrationPreference(context));

        Uri sound = VoicemailNotificationSettingsUtil.getRingTonePreference(context);

        voiceMailChannel.setSound(

                (sound == null) ? Settings.System.DEFAULT_NOTIFICATION_URI : sound,

                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());

        context.getSystemService(NotificationManager.class)

                .createNotificationChannel(voiceMailChannel);

    }

src/java/com/android/internal/telephony/util/VoicemailNotificationSettingsUtil.java

+4 −18
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ import android.content.Context; 
import android.content.SharedPreferences;

import android.net.Uri;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;



public class VoicemailNotificationSettingsUtil {

    private static final String VOICEMAIL_NOTIFICATION_RINGTONE_SHARED_PREFS_KEY_PREFIX =
@@ -64,27 +62,15 @@ public class VoicemailNotificationSettingsUtil { 
    }



   public static void setRingtoneUri(Context context, Uri ringtoneUri) {

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        String ringtoneUriStr = ringtoneUri != null ? ringtoneUri.toString() : "";



        SharedPreferences.Editor editor = prefs.edit();

        editor.putString(getVoicemailRingtoneSharedPrefsKey(), ringtoneUriStr);

        editor.commit();

        // Do nothing; we don't use the shared preference any more.

    }



    public static Uri getRingtoneUri(Context context) {

        final NotificationChannel channel = NotificationChannelController.getChannel(

                NotificationChannelController.CHANNEL_ID_VOICE_MAIL, context);

        return (channel != null) ? channel.getSound() : getRingTonePreference(context);

    }



    public static Uri getRingTonePreference(Context context) {

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);

        migrateVoicemailRingtoneSettingsIfNeeded(context, prefs);

        String uriString = prefs.getString(

                getVoicemailRingtoneSharedPrefsKey(),

                Settings.System.DEFAULT_NOTIFICATION_URI.toString());

        return !TextUtils.isEmpty(uriString) ? Uri.parse(uriString) : null;

        // Note: NEVER look at the shared preferences; this was migrated to the notification channel

        // in Android P.

        return (channel != null) ? channel.getSound() : null;

    }



    /**