Merge "Don't copy MediaMetadata in sanitizer if there is nothing to sanitize" into main (64d0e9e2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaSessionRecord.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -1265,6 +1265,19 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde
		if (metadata == null) {
		return null;
		}

		// Check if there are URIs to sanitize
		boolean hasUris = false;
		for (String key : ART_URIS) {
		if (metadata.containsKey(key)) {
		hasUris = true;
		break;
		}
		}
		if (!hasUris) {
		return metadata;
		}

		MediaMetadata.Builder metadataBuilder = new MediaMetadata.Builder(metadata);
		for (String key: ART_URIS) {
		String uriString = metadata.getString(key);