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

Commit 08392209 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Automerger Merge Worker
Browse files

Merge "Use enforceCallingOrSelfPermission instead in IMMS" into udc-dev am:... 

Merge "Use enforceCallingOrSelfPermission instead in IMMS" into udc-dev am: e50735dd am: 5833e154

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22129792



Change-Id: Icbb8445a15e7f3b252e541446b93e40f861023be
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01abc927 5833e154

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

+16 −10
Original line number Diff line number Diff line
@@ -2003,7 +2003,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    @Override

    public InputMethodInfo getCurrentInputMethodInfoAsUser(@UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        synchronized (ImfLock.class) {
@@ -2017,7 +2017,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    public List<InputMethodInfo> getInputMethodList(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        synchronized (ImfLock.class) {
@@ -2040,7 +2040,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    @Override

    public List<InputMethodInfo> getEnabledInputMethodList(@UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        synchronized (ImfLock.class) {
@@ -2062,7 +2062,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    @Override

    public boolean isStylusHandwritingAvailableAsUser(@UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }
@@ -2158,7 +2158,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    public List<InputMethodSubtype> getEnabledInputMethodSubtypeList(String imiId,

            boolean allowsImplicitlyEnabledSubtypes, @UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }



        synchronized (ImfLock.class) {
@@ -3634,7 +3635,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
            int unverifiedTargetSdkVersion, @UserIdInt int userId,

            @NonNull ImeOnBackInvokedDispatcher imeDispatcher) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);



            if (editorInfo == null || editorInfo.targetInputMethodUser == null

                    || editorInfo.targetInputMethodUser.getIdentifier() != userId) {
@@ -4115,7 +4117,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    @Override

    public InputMethodSubtype getLastInputMethodSubtype(@UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        synchronized (ImfLock.class) {

            if (mSettings.getCurrentUserId() == userId) {
@@ -4133,7 +4136,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    public void setAdditionalInputMethodSubtypes(String imiId, InputMethodSubtype[] subtypes,

            @UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        final int callingUid = Binder.getCallingUid();
@@ -4186,7 +4190,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    public void setExplicitlyEnabledInputMethodSubtypes(String imeId,

            @NonNull int[] subtypeHashCodes, @UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        final int callingUid = Binder.getCallingUid();

        final ComponentName imeComponentName =
@@ -5412,7 +5417,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
    @Override

    public InputMethodSubtype getCurrentInputMethodSubtype(@UserIdInt int userId) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);

        }

        synchronized (ImfLock.class) {

            if (mSettings.getCurrentUserId() == userId) {