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

Commit ef9f1d6e authored by Iván Budnik's avatar Iván Budnik Committed by Android (Google) Code Review
Browse files

Merge "Pass UserHandle from UMO to Output Switcher dialog" into main

parents f52c9023 e0b98de0

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

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

import android.media.session.PlaybackState;

import android.os.Process;

import android.os.Process;

import android.os.Trace;

import android.os.Trace;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

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

                                    mPackageName, mMediaViewHolder.getSeamlessButton());

                        } else {

                        } else {

                            mLogger.logOpenOutputSwitcher(mUid, mPackageName, mInstanceId);

                            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(

                            mMediaOutputDialogManager.createAndShow(

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

                                    mPackageName,

                                    /* aboveStatusBar */ true,

                                    mMediaViewHolder.getSeamlessButton(),

                                    UserHandle.getUserHandleForUid(mUid));

                        }

                        }

                    } else {

                    } else {

                        mLogger.logOpenOutputSwitcher(mUid, mPackageName, mInstanceId);

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

                                Log.w(TAG, "Device pending intent is not an activity.");

                            }

                            }

                        } else {

                        } else {

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

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

                            // different users.

                            mMediaOutputDialogManager.createAndShow(

                            mMediaOutputDialogManager.createAndShow(

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

                                    mPackageName,

                                    /* aboveStatusBar */ true,

                                    mMediaViewHolder.getSeamlessButton(),

                                    UserHandle.getUserHandleForUid(mUid));

                        }

                        }

                    }

                    }

                });

                });