Commit 5220c70c by olly Committed by kim-vde

Demo app: Rename drm_license_url to drm_license_uri

It's quite hard to document drm_force_default_license_uri when the
actual license URI uses "url" terminology. This brings the two in
line.

PiperOrigin-RevId: 326283162
parent a7b1b560
...@@ -55,7 +55,7 @@ public class IntentUtil { ...@@ -55,7 +55,7 @@ public class IntentUtil {
public static final String AD_TAG_URI_EXTRA = "ad_tag_uri"; public static final String AD_TAG_URI_EXTRA = "ad_tag_uri";
public static final String DRM_SCHEME_EXTRA = "drm_scheme"; public static final String DRM_SCHEME_EXTRA = "drm_scheme";
public static final String DRM_LICENSE_URL_EXTRA = "drm_license_url"; public static final String DRM_LICENSE_URI_EXTRA = "drm_license_uri";
public static final String DRM_KEY_REQUEST_PROPERTIES_EXTRA = "drm_key_request_properties"; public static final String DRM_KEY_REQUEST_PROPERTIES_EXTRA = "drm_key_request_properties";
public static final String DRM_SESSION_FOR_CLEAR_CONTENT = "drm_session_for_clear_content"; public static final String DRM_SESSION_FOR_CLEAR_CONTENT = "drm_session_for_clear_content";
public static final String DRM_MULTI_SESSION_EXTRA = "drm_multi_session"; public static final String DRM_MULTI_SESSION_EXTRA = "drm_multi_session";
...@@ -155,7 +155,7 @@ public class IntentUtil { ...@@ -155,7 +155,7 @@ public class IntentUtil {
} }
builder builder
.setDrmUuid(Util.getDrmUuid(Util.castNonNull(drmSchemeExtra))) .setDrmUuid(Util.getDrmUuid(Util.castNonNull(drmSchemeExtra)))
.setDrmLicenseUri(intent.getStringExtra(DRM_LICENSE_URL_EXTRA + extrasKeySuffix)) .setDrmLicenseUri(intent.getStringExtra(DRM_LICENSE_URI_EXTRA + extrasKeySuffix))
.setDrmMultiSession( .setDrmMultiSession(
intent.getBooleanExtra(DRM_MULTI_SESSION_EXTRA + extrasKeySuffix, false)) intent.getBooleanExtra(DRM_MULTI_SESSION_EXTRA + extrasKeySuffix, false))
.setDrmForceDefaultLicenseUri( .setDrmForceDefaultLicenseUri(
...@@ -190,7 +190,7 @@ public class IntentUtil { ...@@ -190,7 +190,7 @@ public class IntentUtil {
MediaItem.DrmConfiguration drmConfiguration, Intent intent, String extrasKeySuffix) { MediaItem.DrmConfiguration drmConfiguration, Intent intent, String extrasKeySuffix) {
intent.putExtra(DRM_SCHEME_EXTRA + extrasKeySuffix, drmConfiguration.uuid.toString()); intent.putExtra(DRM_SCHEME_EXTRA + extrasKeySuffix, drmConfiguration.uuid.toString());
intent.putExtra( intent.putExtra(
DRM_LICENSE_URL_EXTRA + extrasKeySuffix, DRM_LICENSE_URI_EXTRA + extrasKeySuffix,
drmConfiguration.licenseUri != null ? drmConfiguration.licenseUri.toString() : null); drmConfiguration.licenseUri != null ? drmConfiguration.licenseUri.toString() : null);
intent.putExtra(DRM_MULTI_SESSION_EXTRA + extrasKeySuffix, drmConfiguration.multiSession); intent.putExtra(DRM_MULTI_SESSION_EXTRA + extrasKeySuffix, drmConfiguration.multiSession);
intent.putExtra( intent.putExtra(
......
...@@ -375,7 +375,8 @@ public class SampleChooserActivity extends AppCompatActivity ...@@ -375,7 +375,8 @@ public class SampleChooserActivity extends AppCompatActivity
case "drm_scheme": case "drm_scheme":
mediaItem.setDrmUuid(Util.getDrmUuid(reader.nextString())); mediaItem.setDrmUuid(Util.getDrmUuid(reader.nextString()));
break; break;
case "drm_license_url": case "drm_license_uri":
case "drm_license_url": // For backward compatibility only.
mediaItem.setDrmLicenseUri(reader.nextString()); mediaItem.setDrmLicenseUri(reader.nextString());
break; break;
case "drm_key_request_properties": case "drm_key_request_properties":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment