Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marco Nelissen
2016-03-17 15:43:32 +00:00
committed by Gerrit Code Review
parent 258baa35c0 028e91c344
commit 2c37b515ee
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
media/java/android/media/MediaDrm.java
View File

@@ -1082,16 +1082,15 @@ public final class MediaDrm {
* A CryptoSession is obtained using {@link #getCryptoSession}
*/
public final class CryptoSession {
private MediaDrm mDrm;
private byte[] mSessionId;
CryptoSession(@NonNull MediaDrm drm, @NonNull byte[] sessionId,
@NonNull String cipherAlgorithm, @NonNull String macAlgorithm)
CryptoSession(@NonNull byte[] sessionId,
@NonNull String cipherAlgorithm,
@NonNull String macAlgorithm)
{
mSessionId = sessionId;
mDrm = drm;
setCipherAlgorithmNative(drm, sessionId, cipherAlgorithm);
setMacAlgorithmNative(drm, sessionId, macAlgorithm);
setCipherAlgorithmNative(MediaDrm.this, sessionId, cipherAlgorithm);
setMacAlgorithmNative(MediaDrm.this, sessionId, macAlgorithm);
}
/**
@@ -1104,7 +1103,7 @@ public final class MediaDrm {
@NonNull
public byte[] encrypt(
@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
public byte[] decrypt(
@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
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(
@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 String cipherAlgorithm, @NonNull String macAlgorithm)
{
return new CryptoSession(this, sessionId, cipherAlgorithm, macAlgorithm);
return new CryptoSession(sessionId, cipherAlgorithm, macAlgorithm);
}
/**