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

Commit b7fb508e authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Simplify InputMethodSettings#isCurrentProfile()" into main

parents 12c3a0a3 df614b67

services/core/java/com/android/server/inputmethod/InputMethodUtils.java

+2 −5
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.view.textservice.SpellCheckerInfo; 


import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.inputmethod.StartInputFlags;

import com.android.internal.util.ArrayUtils;

import com.android.server.LocalServices;

import com.android.server.pm.UserManagerInternal;

import com.android.server.textservices.TextServicesManagerInternal;
@@ -326,11 +327,7 @@ final class InputMethodUtils { 


        public boolean isCurrentProfile(int userId) {

            synchronized (this) {

                if (userId == mCurrentUserId) return true;

                for (int i = 0; i < mCurrentProfileIds.length; i++) {

                    if (userId == mCurrentProfileIds[i]) return true;

                }

                return false;

                return ArrayUtils.contains(mCurrentProfileIds, userId);

            }

        }