commit 51d5cec08d4a8234a86118b1a7f86e9229459e34
author RoboErik <epastern@google.com> Mon May 19 12:31:01 2014 -0700
committer RoboErik <epastern@google.com> Mon May 19 12:31:01 2014 -0700
tree 7b93f65d09e88d48a9d0067ab0a696654903bfee
parent ce85c358e6f811ce2f78995ff426630db0eb8488

Rename of session APIs

Change-Id: I52aa0264641b3b8b9a1c7971115e39d772b58a07

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 2d483d3..63be538 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -34,8 +34,8 @@
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
 import android.media.AudioManager;
-import android.media.session.Session;
-import android.media.session.SessionManager;
+import android.media.session.MediaSession;
+import android.media.session.MediaSessionManager;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Binder;
@@ -220,7 +220,7 @@
     private final BroadcastReceiver mMediaButtonReceiver = new MediaButtonBroadcastReceiver();
     private final SessionCallback mSessionCallback = new SessionCallback();
 
-    private Session mSession;
+    private MediaSession mSession;
 
     /** boolean indicating restoring mute state on InCallScreen.onResume() */
     private boolean mShouldRestoreMuteOnInCallResume;
@@ -565,11 +565,11 @@
 
             // Register a MediaSession but don't enable it yet. This is a
             // replacement for MediaButtonReceiver
-            SessionManager msm = (SessionManager) getSystemService(Context.MEDIA_SESSION_SERVICE);
+            MediaSessionManager msm = (MediaSessionManager) getSystemService(Context.MEDIA_SESSION_SERVICE);
             mSession = msm.createSession(LOG_TAG);
             mSession.addCallback(mSessionCallback);
-            mSession.setFlags(Session.FLAG_EXCLUSIVE_GLOBAL_PRIORITY
-                    | Session.FLAG_HANDLES_MEDIA_BUTTONS);
+            mSession.setFlags(MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY
+                    | MediaSession.FLAG_HANDLES_MEDIA_BUTTONS);
         }
 
         if (TelephonyCapabilities.supportsOtasp(phone)) {
@@ -1102,7 +1102,7 @@
         }
     }
 
-    private class SessionCallback extends Session.Callback {
+    private class SessionCallback extends MediaSession.Callback {
         @Override
         public void onMediaButton(Intent intent) {
             KeyEvent event = (KeyEvent) intent.getParcelableExtra(Intent.EXTRA_KEY_EVENT);