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

Commit df103819 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add support for Input ads from the SDK runtime." into udc-dev am: e0fe75c3 

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



Change-Id: Id1810d98f0cd3dfe37ac112fe23fd28965872f5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de1b73bb e0fe75c3

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

+2 −2
Original line number Diff line number Diff line
@@ -194,8 +194,8 @@ final class InputMethodUtils { 
            int uid, String packageName) {

        // PackageManagerInternal#getPackageUid() doesn't check MATCH_INSTANT/MATCH_APEX as of

        // writing. So setting 0 should be fine.

        return packageManagerInternal.getPackageUid(packageName, 0 /* flags */,

                UserHandle.getUserId(uid)) == uid;

        return packageManagerInternal.isSameApp(packageName, /* flags= */ 0, uid,

            UserHandle.getUserId(uid));

    }



    /**

services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ public class InputMethodManagerServiceTestBase { 
        when(mMockActivityManagerInternal.isSystemReady()).thenReturn(true);

        when(mMockPackageManagerInternal.getPackageUid(anyString(), anyLong(), anyInt()))

                .thenReturn(Binder.getCallingUid());

        when(mMockPackageManagerInternal.isSameApp(anyString(), anyLong(), anyInt(), anyInt()))

            .thenReturn(true);

        when(mMockWindowManagerInternal.onToggleImeRequested(anyBoolean(), any(), any(), anyInt()))

                .thenReturn(TEST_IME_TARGET_INFO);

        when(mMockInputMethodClient.asBinder()).thenReturn(mMockInputMethodBinder);