Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0b98de0 authored by Iván Budnik's avatar Iván Budnik
Browse files

Pass UserHandle from UMO to Output Switcher dialog 

Plumbing the right user handle allows the Output Switcher dialog to
handle cross-user routing appropriately.

Test: Manual.
Bug: 321969740
Flag: N/A
Change-Id: Ic6308f36ded3333829e0a0e97757b5a88aaa2c3b
parent e70357a6

packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaControlPanel.java

+9 −8
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.media.session.MediaSession; 
import android.media.session.PlaybackState;

import android.os.Process;

import android.os.Trace;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;
@@ -738,11 +739,11 @@ public class MediaControlPanel { 
                                    mPackageName, mMediaViewHolder.getSeamlessButton());

                        } else {

                            mLogger.logOpenOutputSwitcher(mUid, mPackageName, mInstanceId);

                            // TODO: b/321969740 - Populate the userHandle parameter. The user

                            // handle is necessary to disambiguate the same package running on

                            // different users.

                            mMediaOutputDialogManager.createAndShow(

                                    mPackageName, true, mMediaViewHolder.getSeamlessButton(), null);

                                    mPackageName,

                                    /* aboveStatusBar */ true,

                                    mMediaViewHolder.getSeamlessButton(),

                                    UserHandle.getUserHandleForUid(mUid));

                        }

                    } else {

                        mLogger.logOpenOutputSwitcher(mUid, mPackageName, mInstanceId);
@@ -770,11 +771,11 @@ public class MediaControlPanel { 
                                Log.w(TAG, "Device pending intent is not an activity.");

                            }

                        } else {

                            // TODO: b/321969740 - Populate the userHandle parameter. The user

                            // handle is necessary to disambiguate the same package running on

                            // different users.

                            mMediaOutputDialogManager.createAndShow(

                                    mPackageName, true, mMediaViewHolder.getSeamlessButton(), null);

                                    mPackageName,

                                    /* aboveStatusBar */ true,

                                    mMediaViewHolder.getSeamlessButton(),

                                    UserHandle.getUserHandleForUid(mUid));

                        }

                    }

                });