Index: media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
index 73cc124ba754af023321a8525f287e50e7544be4..3492867f0df01acac2316f8d9e3da4d61919188a 100644 |
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java |
@@ -304,8 +304,8 @@ public class MediaDrmBridge { |
if (Build.VERSION.RELEASE.equals("4.4")) { |
singleSessionMode = true; |
} |
- Log.d(TAG, "MediaDrmBridge uses " + |
- (singleSessionMode ? "single" : "multiple") + "-session mode."); |
+ Log.d(TAG, "MediaDrmBridge uses " |
+ + (singleSessionMode ? "single" : "multiple") + "-session mode."); |
MediaDrmBridge mediaDrmBridge = null; |
try { |
@@ -451,8 +451,8 @@ public class MediaDrmBridge { |
// Check mMediaDrm != null because error may happen in createSession(). |
// Check !mProvisioningPending because NotProvisionedException may be |
// thrown in createSession(). |
- while (mMediaDrm != null && !mProvisioningPending && |
- !mPendingCreateSessionDataQueue.isEmpty()) { |
+ while (mMediaDrm != null && !mProvisioningPending |
+ && !mPendingCreateSessionDataQueue.isEmpty()) { |
PendingCreateSessionData pendingData = mPendingCreateSessionDataQueue.poll(); |
int sessionId = pendingData.sessionId(); |
byte[] initData = pendingData.initData(); |
@@ -509,8 +509,8 @@ public class MediaDrmBridge { |
if (mSingleSessionMode) { |
session = mMediaCryptoSession; |
- if (mSessionMimeTypes.get(session) != null && |
- !mSessionMimeTypes.get(session).equals(mime)) { |
+ if (mSessionMimeTypes.get(session) != null |
+ && !mSessionMimeTypes.get(session).equals(mime)) { |
Log.e(TAG, "Only one mime type is supported in single session mode."); |
onSessionError(sessionId); |
return; |
@@ -539,8 +539,8 @@ public class MediaDrmBridge { |
onSessionCreated(sessionId, getWebSessionId(session)); |
onSessionMessage(sessionId, request); |
if (newSessionOpened) { |
- Log.d(TAG, "createSession(): Session " + getWebSessionId(session) + |
- " (" + sessionId + ") created."); |
+ Log.d(TAG, "createSession(): Session " + getWebSessionId(session) |
+ + " (" + sessionId + ") created."); |
} |
mSessionIds.put(session, sessionId); |