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

Commit 5e63953b authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Revert "Correctly play the ringtone set by secondary users" 

This reverts commit 39af15e6.

Change-Id: I8b3d9356f9df3d840082736b85282bb903d6869f
parent 39af15e6

src/com/android/server/telecom/RingtoneFactory.java

+2 −17
Original line number Diff line number Diff line
@@ -16,14 +16,11 @@ 


package com.android.server.telecom;



import android.app.ActivityManager;

import android.content.Context;

import android.content.pm.PackageManager;

import android.media.AudioManager;

import android.media.RingtoneManager;

import android.media.Ringtone;

import android.net.Uri;

import android.os.UserHandle;

import android.provider.Settings;



import com.android.internal.annotations.VisibleForTesting;
@@ -42,23 +39,11 @@ public class RingtoneFactory { 
    }



    public Ringtone getRingtone(Uri ringtoneUri) {

        UserHandle userHandle = UserHandle.of(ActivityManager.getCurrentUser());

        Context userContext = mContext;

        try {

            userContext = mContext.createPackageContextAsUser(mContext.getPackageName(), 0,

                    userHandle);



        } catch (PackageManager.NameNotFoundException e) {

            Log.w("RingtoneFactory", "Package name not found: " + e.getMessage());

        }

        if (ringtoneUri == null) {

            String userRingtoneChoice = Settings.System.getStringForUser(

                    userContext.getContentResolver(), Settings.System.RINGTONE,

                    userHandle.getIdentifier());

            ringtoneUri = (userRingtoneChoice == null) ? null : Uri.parse(userRingtoneChoice);

            ringtoneUri = Settings.System.DEFAULT_RINGTONE_URI;

        }



        Ringtone ringtone = RingtoneManager.getRingtone(userContext, ringtoneUri);

        Ringtone ringtone = RingtoneManager.getRingtone(mContext, ringtoneUri);

        if (ringtone != null) {

            ringtone.setStreamType(AudioManager.STREAM_RING);

        }