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

Commit 5e55f614 authored by Iván Budnik's avatar Iván Budnik Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of ef33f4c1 to tm-dev... 

resolve merge conflicts of ef33f4c1 to tm-dev am: 7647712c am: 60361a11

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20402711



Change-Id: Ie3acb47a8d61ff1fa642d4674238cb16c2374a54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd68fac9 60361a11

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;