commit b24340729371c4e5133b0784a475933d1034eb18
author Iván Budnik <ivanbuper@google.com> Mon Sep 12 19:56:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 12 19:56:47 2022 +0000
tree 1a0c4c3b5650ad9ea089f2b7946fd492c30ac534
parent 5725377e5cf85379fafc79fffcdd887af53e1f72
parent f8f07e22f1ba2b3c19a22a4c69aeb7953a36c4b6

Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1

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

Change-Id: Ib19add857ac741684ba902dcad62b423949618b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java
index 4ba43f9..348e9c1 100644
--- a/services/core/java/com/android/server/media/MediaSessionRecord.java
+++ b/services/core/java/com/android/server/media/MediaSessionRecord.java
@@ -18,7 +18,6 @@
 
 import android.annotation.Nullable;
 import android.app.PendingIntent;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ParceledListSlice;
@@ -50,8 +49,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.util.Slog;
 import android.view.KeyEvent;
@@ -837,30 +834,10 @@
             mHandler.post(MessageHandler.MSG_UPDATE_SESSION_STATE);
         }
 
-        private boolean checkComponentNamePackage(PendingIntent pi, String packageName) {
-            ComponentName componentName = null;
-            if (pi != null && pi.getIntent() != null) {
-                componentName = pi.getIntent().getComponent();
-            }
-
-            if(componentName != null
-                   && !TextUtils.equals(packageName, componentName.getPackageName())) {
-                return false;
-            }
-
-            return true;
-        }
-
         @Override
         public void setMediaButtonReceiver(PendingIntent pi) throws RemoteException {
             final long token = Binder.clearCallingIdentity();
             try {
-                if (!checkComponentNamePackage(pi, mPackageName)) {
-                    EventLog.writeEvent(0x534e4554, "238177121", -1, ""); // SafetyNet logging
-                    throw new IllegalArgumentException("Component Name package does not match "
-                            + "package name provided to MediaSessionRecord.");
-                }
-
                 if ((mPolicies & SessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER)
                         != 0) {
                     return;