Keep track of origin ID for logging

Adds |mOrigin| to keep track of the origin ID used.

Also removes some unnecessary logging, especially of errors when
a security level is not supported.

Bug: 917527
Test: Installed Chrome and looked at the adb log
Change-Id: Icb930af9b96da42d4ce1c675639ada4cb5cfc8ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1802697Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: John Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708041}

media/base/android/java/src/org/chromium/media/MediaDrmBridge.java

@@ -112,6 +112,9 @@ public class MediaDrmBridge {
     // Whether the current MediaDrmBridge instance is waiting for provisioning response.
     private boolean mProvisioningPending;
 
+    // Current 'ORIGIN" setting.
+    private String mOrigin;
+
     // Boolean to track if 'ORIGIN' is set in MediaDrm.
     private boolean mOriginSet;
 
@@ -486,7 +489,7 @@ public class MediaDrmBridge {
      */
     private boolean setOrigin(String origin) {
         assert Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
-        Log.i(TAG, "Set origin: %s", origin);
+        Log.d(TAG, "Set origin: %s", origin);
 
         if (!isWidevine()) {
             Log.d(TAG, "Property " + ORIGIN + " isn't supported");
@@ -498,6 +501,7 @@ public class MediaDrmBridge {
 
         try {
             mMediaDrm.setPropertyString(ORIGIN, origin);
+            mOrigin = origin;
             mOriginSet = true;
             return true;
         } catch (java.lang.IllegalArgumentException e) {
@@ -533,7 +537,7 @@ public class MediaDrmBridge {
             return false;
         }
 
-        Log.i(TAG, "Security level: current %s, new %s", currentSecurityLevel, securityLevel);
+        Log.d(TAG, "Security level: current %s, new %s", currentSecurityLevel, securityLevel);
         if (securityLevel.equals(currentSecurityLevel)) {
             // No need to set the same security level again. This is not just
             // a shortcut! Setting the same security level actually causes an
@@ -545,9 +549,7 @@ public class MediaDrmBridge {
             mMediaDrm.setPropertyString(SECURITY_LEVEL, securityLevel);
             return true;
         } catch (java.lang.IllegalArgumentException e) {
-            Log.e(TAG, "Failed to set security level %s", securityLevel, e);
         } catch (java.lang.IllegalStateException e) {
-            Log.e(TAG, "Failed to set security level %s", securityLevel, e);
         }
 
         Log.e(TAG, "Security level %s not supported!", securityLevel);
@@ -1204,6 +1206,7 @@ public class MediaDrmBridge {
             return false;
         }
 
+        Log.i(TAG, "Provisioning origin ID %s", mOriginSet ? mOrigin : "<none>");
         MediaDrmBridgeJni.get().onProvisionRequest(mNativeMediaDrmBridge, MediaDrmBridge.this,
                 request.getDefaultUrl(), request.getData());
         return true;