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

Commit 7647712c authored by Iván Budnik's avatar Iván Budnik
Browse files

resolve merge conflicts of ef33f4c1 to tm-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: 257525563
Change-Id: I15f44f21bb23b7cabc6c17ea5a15e0dfaaca97f6
parents 6ec31224 ef33f4c1

services/core/java/com/android/server/media/MediaSessionRecord.java

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ import android.os.Process; 
import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.SystemClock;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.view.KeyEvent;
@@ -956,6 +958,14 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
        public void setMediaButtonBroadcastReceiver(ComponentName receiver) throws RemoteException {

            final long token = Binder.clearCallingIdentity();

            try {

                //mPackageName has been verified in MediaSessionService.enforcePackageName().

                if (receiver != null && !TextUtils.equals(

                        mPackageName, receiver.getPackageName())) {

                    EventLog.writeEvent(0x534e4554, "238177121", -1, ""); // SafetyNet logging.

                    throw new IllegalArgumentException("receiver does not belong to "

                            + "package name provided to MediaSessionRecord. Pkg = " + mPackageName

                            + ", Receiver Pkg = " + receiver.getPackageName());

                }

                if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER)

                        != 0) {

                    return;