Provide support versions of Activity.set/getMediaController

Provide setSupportMediaController() and getSupportMediaController()
methods in FragmentActivity to allow users to support pre-API 21
versions of Android while maintaining the convenience of the newer
APIs. Ensure that setting a media controller via
setSupportMediaController() will call into the framework
setMediaController() on API 21+ devices.

BUG: 24333489
Change-Id: I27b4d380c3e24e0e9c2857bb37955500ffe76a56

1 files changed, 5 insertions, 0 deletions

diff --git a/v4/api21/android/support/v4/app/ActivityCompat21.java b/v4/api21/android/support/v4/app/ActivityCompat21.java
index f690fff0ed..2e6de1e462 100644
--- a/v4/api21/android/support/v4/app/ActivityCompat21.java
+++ b/v4/api21/android/support/v4/app/ActivityCompat21.java
@@ -21,6 +21,7 @@ import android.app.SharedElementCallback;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.RectF;
+import android.media.session.MediaController;
 import android.os.Parcelable;
 import android.view.View;
 
@@ -31,6 +32,10 @@ import java.util.Map;
 
 class ActivityCompat21 {
 
+    public static void setMediaController(Activity activity, Object mediaControllerObj) {
+        activity.setMediaController((MediaController) mediaControllerObj);
+    }
+
     public static void finishAfterTransition(Activity activity) {
         activity.finishAfterTransition();
     }