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

Commit d46f500c authored by Li Chen's avatar Li Chen Committed by android-build-merger
Browse files

Merge "Remove the field of MediaDrm from inner class CryptoSession."

am: 2c37b515

* commit '2c37b515':
  Remove the field of MediaDrm from inner class CryptoSession.
parents 3fc27c34 2c37b515
Loading
Loading
Loading
Loading
+10 −11
Original line number Original line Diff line number Diff line
@@ -1082,16 +1082,15 @@ public final class MediaDrm {
     * A CryptoSession is obtained using {@link #getCryptoSession}
     * A CryptoSession is obtained using {@link #getCryptoSession}
     */
     */
    public final class CryptoSession {
    public final class CryptoSession {
        private MediaDrm mDrm;
        private byte[] mSessionId;
        private byte[] mSessionId;


        CryptoSession(@NonNull MediaDrm drm, @NonNull byte[] sessionId,
        CryptoSession(@NonNull byte[] sessionId,
                @NonNull String cipherAlgorithm, @NonNull String macAlgorithm)
                      @NonNull String cipherAlgorithm,
                      @NonNull String macAlgorithm)
        {
        {
            mSessionId = sessionId;
            mSessionId = sessionId;
            mDrm = drm;
            setCipherAlgorithmNative(MediaDrm.this, sessionId, cipherAlgorithm);
            setCipherAlgorithmNative(drm, sessionId, cipherAlgorithm);
            setMacAlgorithmNative(MediaDrm.this, sessionId, macAlgorithm);
            setMacAlgorithmNative(drm, sessionId, macAlgorithm);
        }
        }


        /**
        /**
@@ -1104,7 +1103,7 @@ public final class MediaDrm {
        @NonNull
        @NonNull
        public byte[] encrypt(
        public byte[] encrypt(
                @NonNull byte[] keyid, @NonNull byte[] input, @NonNull byte[] iv) {
                @NonNull byte[] keyid, @NonNull byte[] input, @NonNull byte[] iv) {
            return encryptNative(mDrm, mSessionId, keyid, input, iv);
            return encryptNative(MediaDrm.this, mSessionId, keyid, input, iv);
        }
        }


        /**
        /**
@@ -1117,7 +1116,7 @@ public final class MediaDrm {
        @NonNull
        @NonNull
        public byte[] decrypt(
        public byte[] decrypt(
                @NonNull byte[] keyid, @NonNull byte[] input, @NonNull byte[] iv) {
                @NonNull byte[] keyid, @NonNull byte[] input, @NonNull byte[] iv) {
            return decryptNative(mDrm, mSessionId, keyid, input, iv);
            return decryptNative(MediaDrm.this, mSessionId, keyid, input, iv);
        }
        }


        /**
        /**
@@ -1128,7 +1127,7 @@ public final class MediaDrm {
         */
         */
        @NonNull
        @NonNull
        public byte[] sign(@NonNull byte[] keyid, @NonNull byte[] message) {
        public byte[] sign(@NonNull byte[] keyid, @NonNull byte[] message) {
            return signNative(mDrm, mSessionId, keyid, message);
            return signNative(MediaDrm.this, mSessionId, keyid, message);
        }
        }


        /**
        /**
@@ -1142,7 +1141,7 @@ public final class MediaDrm {
         */
         */
        public boolean verify(
        public boolean verify(
                @NonNull byte[] keyid, @NonNull byte[] message, @NonNull byte[] signature) {
                @NonNull byte[] keyid, @NonNull byte[] message, @NonNull byte[] signature) {
            return verifyNative(mDrm, mSessionId, keyid, message, signature);
            return verifyNative(MediaDrm.this, mSessionId, keyid, message, signature);
        }
        }
    };
    };


@@ -1170,7 +1169,7 @@ public final class MediaDrm {
            @NonNull byte[] sessionId,
            @NonNull byte[] sessionId,
            @NonNull String cipherAlgorithm, @NonNull String macAlgorithm)
            @NonNull String cipherAlgorithm, @NonNull String macAlgorithm)
    {
    {
        return new CryptoSession(this, sessionId, cipherAlgorithm, macAlgorithm);
        return new CryptoSession(sessionId, cipherAlgorithm, macAlgorithm);
    }
    }


    /**
    /**