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

Commit 84b3aebc authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Revert "Enforce ComponentName belongs to caller app" 

This reverts commit 7319e40b.

This revert was manually created from the patch in ag/19748522,
but is not a revert created using the gerrit UI because of
b/251778962.

Reason for revert: b/241798893. Note: this fix is not the root
cause of the breakage. It just exposes a previously unknown bug.
See linked bug.

Bug: 251778962
Bug: 241798893
Bug: 238177121
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: I01bda0f5bf343d73c480ad64b562dd0a2ee46e30
Merged-In: I01bda0f5bf343d73c480ad64b562dd0a2ee46e30
Merged-In: I2ec5fd036af1d35c6d3fe000ee41f3347f9aea41
parent 89e0dcf6

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

+0 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.os.Handler; 
import android.os.PowerWhitelistManager;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.view.KeyEvent;
@@ -118,12 +117,6 @@ final class MediaButtonReceiverHolder { 
        int componentType = getComponentType(pendingIntent);

        ComponentName componentName = getComponentName(pendingIntent, componentType);

        if (componentName != null) {

            if (!TextUtils.equals(componentName.getPackageName(), sessionPackageName)) {

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

                throw new IllegalArgumentException("ComponentName does not belong to "

                        + "sessionPackageName. sessionPackageName = " + sessionPackageName

                        + ", ComponentName pkg = " + componentName.getPackageName());

            }

            return new MediaButtonReceiverHolder(userId, pendingIntent, componentName,

                    componentType);

        }

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

+0 −18
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 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;
@@ -935,14 +934,6 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
        @Override

        public void setMediaButtonReceiver(PendingIntent pi, String sessionPackageName)

                throws RemoteException {

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

            if (!TextUtils.equals(sessionPackageName, mPackageName)) {

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

                throw new IllegalArgumentException("sessionPackageName name does not match "

                        + "package name provided to MediaSessionRecord. sessionPackageName = "

                        + sessionPackageName + ", pkg = "

                        + mPackageName);

            }

            final long token = Binder.clearCallingIdentity();

            try {

                if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER)
@@ -961,15 +952,6 @@ 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;