Revert "Enforce ComponentName belongs to caller app"

This reverts commit 7319e40b37.

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.

Change-Id: I2ec5fd036af1d35c6d3fe000ee41f3347f9aea41
Merged-In: I01bda0f5bf343d73c480ad64b562dd0a2ee46e30
This commit is contained in:
Iván Budnik
2022-08-30 12:44:12 +00:00
parent 7319e40b37
commit 8914ae87de
2 changed files with 0 additions and 26 deletions

View File

@@ -32,7 +32,6 @@ import android.os.Handler;
import android.os.PowerWhitelistManager; import android.os.PowerWhitelistManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -118,12 +117,6 @@ final class MediaButtonReceiverHolder {
int componentType = getComponentType(pendingIntent); int componentType = getComponentType(pendingIntent);
ComponentName componentName = getComponentName(pendingIntent, componentType); ComponentName componentName = getComponentName(pendingIntent, componentType);
if (componentName != null) { 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, return new MediaButtonReceiverHolder(userId, pendingIntent, componentName,
componentType); componentType);
} }

View File

@@ -52,8 +52,6 @@ import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.os.SystemClock; import android.os.SystemClock;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -940,14 +938,6 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
@Override @Override
public void setMediaButtonReceiver(PendingIntent pi, String sessionPackageName) public void setMediaButtonReceiver(PendingIntent pi, String sessionPackageName)
throws RemoteException { 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(); final long token = Binder.clearCallingIdentity();
try { try {
if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER) if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER)
@@ -966,15 +956,6 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
public void setMediaButtonBroadcastReceiver(ComponentName receiver) throws RemoteException { public void setMediaButtonBroadcastReceiver(ComponentName receiver) throws RemoteException {
final long token = Binder.clearCallingIdentity(); final long token = Binder.clearCallingIdentity();
try { 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) if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER)
!= 0) { != 0) {
return; return;