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

Commit 1594aae8 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Add safetyNet Logging comments and remove redundant code 

Change-Id: I357ceec55c773be5296eca8fdb6dea4dc3887b8c
Test: m
Bug: 238177121
parent 02e7a222

media/java/android/media/session/ISession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ interface ISession { 
    ISessionController getController();

    void setFlags(int flags);

    void setActive(boolean active);

    void setMediaButtonReceiver(in PendingIntent mbr, String sessionPackageName);

    void setMediaButtonReceiver(in PendingIntent mbr);

    void setMediaButtonBroadcastReceiver(in ComponentName broadcastReceiver);

    void setLaunchPendingIntent(in PendingIntent pi);

    void destroySession();

media/java/android/media/session/MediaSession.java

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public final class MediaSession { 
    @Deprecated

    public void setMediaButtonReceiver(@Nullable PendingIntent mbr) {

        try {

            mBinder.setMediaButtonReceiver(mbr, mContext.getPackageName());

            mBinder.setMediaButtonReceiver(mbr);

        } catch (RemoteException e) {

            Log.wtf(TAG, "Failure in setMediaButtonReceiver.", e);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ final class MediaButtonReceiverHolder { 
        ComponentName componentName = getComponentName(pendingIntent, componentType);

        if (componentName != null) {

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

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

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

                throw new IllegalArgumentException("ComponentName does not belong to "

                        + "sessionPackageName. sessionPackageName = " + sessionPackageName

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

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

+3 −12
Original line number Diff line number Diff line
@@ -914,16 +914,7 @@ 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, "");

                throw new IllegalArgumentException("sessionPackageName name does not match "

                        + "package name provided to MediaSessionRecord. sessionPackageName = "

                        + sessionPackageName + ", pkg = "

                        + mPackageName);

            }

        public void setMediaButtonReceiver(PendingIntent pi) throws RemoteException {

            final long token = Binder.clearCallingIdentity();

            try {

                if ((mPolicies & MediaSessionPolicyProvider.SESSION_POLICY_IGNORE_BUTTON_RECEIVER)
@@ -931,7 +922,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
                    return;

                }

                mMediaButtonReceiverHolder =

                        MediaButtonReceiverHolder.create(mContext, mUserId, pi, sessionPackageName);

                        MediaButtonReceiverHolder.create(mContext, mUserId, pi, mPackageName);

                mService.onMediaButtonReceiverChanged(MediaSessionRecord.this);

            } finally {

                Binder.restoreCallingIdentity(token);
@@ -945,7 +936,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR 
                //mPackageName has been verified in MediaSessionService.enforcePackageName().

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

                        mPackageName, receiver.getPackageName())) {

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

                    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());