diff options
| author | RoboErik <epastern@google.com> | 2014-02-26 18:13:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-26 18:13:35 +0000 |
| commit | 8fb4cf1ef4ca3b3c5ea1897cc1a4f9f5dc454877 (patch) | |
| tree | c2f53c3ceda88378d2122d4600b648eaffaf552c /core | |
| parent | 073c1c1f60288329bc41e1eda88db58f65bf9e32 (diff) | |
| parent | 2f5b057da7d05d5d699a272aa24fd7c97cdda820 (diff) | |
| download | frameworks_base-8fb4cf1ef4ca3b3c5ea1897cc1a4f9f5dc454877.zip frameworks_base-8fb4cf1ef4ca3b3c5ea1897cc1a4f9f5dc454877.tar.gz frameworks_base-8fb4cf1ef4ca3b3c5ea1897cc1a4f9f5dc454877.tar.bz2 | |
Merge "Move Session apis to android.media.session"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 7efb3f1..9b3643c 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -63,7 +63,7 @@ import android.location.ILocationManager; import android.location.LocationManager; import android.media.AudioManager; import android.media.MediaRouter; -import android.media.MediaSessionManager; +import android.media.session.MediaSessionManager; import android.net.ConnectivityManager; import android.net.IConnectivityManager; import android.net.INetworkPolicyManager; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index d05d1a1..81a886a 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2352,10 +2352,10 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a - * {@link android.media.MediaSessionManager} for managing media Sessions. + * {@link android.media.session.MediaSessionManager} for managing media Sessions. * * @see #getSystemService - * @see android.media.MediaSessionManager + * @see android.media.session.MediaSessionManager */ public static final String MEDIA_SESSION_SERVICE = "media_session"; |