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

Commit 95137e9a authored by Galia Peycheva's avatar Galia Peycheva Committed by Android (Google) Code Review
Browse files

Merge "Fix Assistant always being called in primary user"

parents d6a071ad 32e22084

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -3319,7 +3319,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                & Configuration.UI_MODE_TYPE_MASK) == Configuration.UI_MODE_TYPE_TELEVISION) {

            // On TV, use legacy handling until assistants are implemented in the proper way.

            ((SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE))

                    .launchLegacyAssist(hint, UserHandle.myUserId(), args);

                    .launchLegacyAssist(hint, mCurrentUserId, args);

        } else {

            if (hint != null) {

                if (args == null) {