commit e065f4ef217c422e7e64900170f4303e45286266
author Simon Dai <sdai@google.com> Thu Aug 01 17:56:59 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 01 17:56:59 2019 -0700
tree 198bf6310b70292941d6694eff1de7f4c247821c
parent 3f75ad8b5236cc3607139704cba9f6a0c4cbb027
parent ac32058e74dbc5bba9e1ae9a64a184e8f9a46ae4

Save media sources per user am: cda4b1cabc am: efefd4abbe am: 37e26230d3
am: ac32058e74

Change-Id: I06a1d7cf3317fd7bb6481ee9425bd15e3966c0cc

service/src/com/android/car/CarMediaService.java

diff --git a/service/src/com/android/car/CarMediaService.java b/service/src/com/android/car/CarMediaService.java
index c0c226b..f0ca90d 100644
--- a/service/src/com/android/car/CarMediaService.java
+++ b/service/src/com/android/car/CarMediaService.java
@@ -91,6 +91,7 @@
     private boolean mStartPlayback;
 
     private boolean mPendingInit;
+    private int mCurrentUser;
 
     private final RemoteCallbackList<ICarMediaSourceListener> mMediaSourceListeners =
             new RemoteCallbackList();
@@ -141,6 +142,7 @@
             if (Log.isLoggable(CarLog.TAG_MEDIA, Log.DEBUG)) {
                 Log.d(CarLog.TAG_MEDIA, "Switched to user " + ActivityManager.getCurrentUser());
             }
+            mCurrentUser = ActivityManager.getCurrentUser();
             // TODO(b/137037900): handle multiple users properly.
             updateMediaSessionCallbackForCurrentUser();
             if (mUserManager.isUserUnlocked(ActivityManager.getCurrentUser())) {
@@ -155,6 +157,7 @@
         mContext = context;
         mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
         mMediaSessionManager = mContext.getSystemService(MediaSessionManager.class);
+        mSharedPrefs = mContext.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
 
         mHandlerThread = new HandlerThread(CarLog.TAG_MEDIA);
         mHandlerThread.start();
@@ -171,6 +174,7 @@
         userSwitchFilter.addAction(Intent.ACTION_USER_SWITCHED);
         mContext.registerReceiver(mUserSwitchReceiver, userSwitchFilter);
 
+        mCurrentUser = ActivityManager.getCurrentUser();
         updateMediaSessionCallbackForCurrentUser();
     }
 
@@ -182,10 +186,11 @@
     }
 
     private void initUser() {
-        mSharedPrefs = mContext.getSharedPreferences(SHARED_PREF, Context.MODE_PRIVATE);
         mPrimaryMediaComponent = getLastMediaSource();
-        mStartPlayback = mSharedPrefs.getInt(PLAYBACK_STATE_KEY, PlaybackState.STATE_NONE)
-                == PlaybackState.STATE_PLAYING;
+        mActiveUserMediaController = null;
+        String key = PLAYBACK_STATE_KEY + mCurrentUser;
+        mStartPlayback = mSharedPrefs.getInt(key, PlaybackState.STATE_NONE)
+            == PlaybackState.STATE_PLAYING;
         notifyListeners();
     }
 
@@ -547,20 +552,22 @@
 
     private void saveLastMediaSource(@NonNull ComponentName component) {
         String componentName = component.flattenToString();
-        String serialized = mSharedPrefs.getString(SOURCE_KEY, null);
+        String key = SOURCE_KEY + mCurrentUser;
+        String serialized = mSharedPrefs.getString(key, null);
         if (serialized == null) {
-            mSharedPrefs.edit().putString(SOURCE_KEY, componentName).apply();
+            mSharedPrefs.edit().putString(key, componentName).apply();
         } else {
             Deque<String> componentNames = getComponentNameList(serialized);
             componentNames.remove(componentName);
             componentNames.addFirst(componentName);
-            mSharedPrefs.edit().putString(SOURCE_KEY, serializeComponentNameList(componentNames))
+            mSharedPrefs.edit().putString(key, serializeComponentNameList(componentNames))
                     .apply();
         }
     }
 
     private ComponentName getLastMediaSource() {
-        String serialized = mSharedPrefs.getString(SOURCE_KEY, null);
+        String key = SOURCE_KEY + mCurrentUser;
+        String serialized = mSharedPrefs.getString(key, null);
         if (!TextUtils.isEmpty(serialized)) {
             for (String name : getComponentNameList(serialized)) {
                 ComponentName componentName = ComponentName.unflattenFromString(name);
@@ -600,7 +607,8 @@
             mStartPlayback = false;
         }
         if (mSharedPrefs != null) {
-            mSharedPrefs.edit().putInt(PLAYBACK_STATE_KEY, state).apply();
+            String key = PLAYBACK_STATE_KEY + mCurrentUser;
+            mSharedPrefs.edit().putInt(key, state).apply();
         }
     }