summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBiswarup Pal <biswarupp@google.com>2022-04-05 11:57:17 +0000
committerBiswarup Pal <biswarupp@google.com>2022-04-05 12:06:37 +0000
commit7b38eabe8415060cfc54adf306399eab9548ac9a (patch)
treeb01a3705f78e48ee1f6bb9e3c84f0134381afc2d
parentc4fcf4a58e59d9d35b3177dfcd685005945a6a34 (diff)
downloadMediaProvider-7b38eabe8415060cfc54adf306399eab9548ac9a.tar.gz
Pass correct config values during SurfaceController creation
Test: manually tested photo picker Change-Id: I976ca006ea3443e82b2919c1b33e9867d31299f0
-rw-r--r--apex/framework/java/android/provider/CloudMediaProvider.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/apex/framework/java/android/provider/CloudMediaProvider.java b/apex/framework/java/android/provider/CloudMediaProvider.java
index e86e8be15..2ef671ae4 100644
--- a/apex/framework/java/android/provider/CloudMediaProvider.java
+++ b/apex/framework/java/android/provider/CloudMediaProvider.java
@@ -16,8 +16,8 @@
package android.provider;
-import static android.provider.CloudMediaProviderContract.EXTRA_ERROR_MESSAGE;
import static android.provider.CloudMediaProviderContract.EXTRA_ASYNC_CONTENT_PROVIDER;
+import static android.provider.CloudMediaProviderContract.EXTRA_ERROR_MESSAGE;
import static android.provider.CloudMediaProviderContract.EXTRA_FILE_DESCRIPTOR;
import static android.provider.CloudMediaProviderContract.EXTRA_LOOPING_PLAYBACK_ENABLED;
import static android.provider.CloudMediaProviderContract.EXTRA_SURFACE_CONTROLLER;
@@ -375,13 +375,16 @@ public abstract class CloudMediaProvider extends ContentProvider {
throw new IllegalArgumentException("Missing surface state callback");
}
+ final boolean enableLoop = extras.getBoolean(EXTRA_LOOPING_PLAYBACK_ENABLED,
+ DEFAULT_LOOPING_PLAYBACK_ENABLED);
+ final boolean muteAudio = extras.getBoolean(EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED,
+ DEFAULT_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED);
final CloudMediaSurfaceStateChangedCallback callback =
new CloudMediaSurfaceStateChangedCallback(
ICloudMediaSurfaceStateChangedCallback.Stub.asInterface(binder));
final Bundle config = new Bundle();
- config.putBoolean(EXTRA_LOOPING_PLAYBACK_ENABLED, DEFAULT_LOOPING_PLAYBACK_ENABLED);
- config.putBoolean(EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED,
- DEFAULT_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED);
+ config.putBoolean(EXTRA_LOOPING_PLAYBACK_ENABLED, enableLoop);
+ config.putBoolean(EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED, muteAudio);
final CloudMediaSurfaceController controller =
onCreateCloudMediaSurfaceController(config, callback);
if (controller == null) {