commit a4b9a191a85507b077f59b6ac5ce210caa0a84a3
author RoboErik <epastern@google.com> Thu Sep 04 20:52:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 20:52:56 2014 +0000
tree 4f79fa0e6644ee8d87afc1553041feb9e0bf8ec5
parent b6efa23adc55a694ea4a82c400513fcfe38e51d9
parent 8e1e84847e47097a60d9049cbc78b6880f9c5656

Merge "Ensure there's a valid handler when registering a sessions listener" into lmp-dev

media/java/android/media/RemoteController.java

diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java
index f378cef..fbfac89 100644
--- a/media/java/android/media/RemoteController.java
+++ b/media/java/android/media/RemoteController.java
@@ -789,8 +789,12 @@
     void startListeningToSessions() {
         final ComponentName listenerComponent = new ComponentName(mContext,
                 mOnClientUpdateListener.getClass());
+        Handler handler = null;
+        if (Looper.myLooper() == null) {
+            handler = new Handler(Looper.getMainLooper());
+        }
         mSessionManager.addOnActiveSessionsChangedListener(mSessionListener, listenerComponent,
-                UserHandle.myUserId(), null);
+                UserHandle.myUserId(), handler);
         mSessionListener.onActiveSessionsChanged(mSessionManager
                 .getActiveSessions(listenerComponent));
         if (DEBUG) {