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

Commit b72545e7 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Remove unnecessary "I" from IIInputContentUriTokenResultCallback 

This is a mechanical refactoring CL that does nothing but remaning

  IIInputContentUriTokenResultCallback

to

  IInputContentUriTokenResultCallback.

There should be no observable behavior change in this CL.

Bug: 173340613
Bug: 194308519
Test: presubmit
Change-Id: Id37fd7c44145934aea42d7944e5b212c6ff543f6
parent 1afbd902

core/java/com/android/internal/inputmethod/CallbackUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -116,13 +116,13 @@ public final class CallbackUtils { 
    }



    /**

     * A utility method using given {@link IIInputContentUriTokenResultCallback} to callback the

     * A utility method using given {@link IInputContentUriTokenResultCallback} to callback the

     * result.

     *

     * @param callback {@link IIInputContentUriTokenResultCallback} to be called back.

     * @param callback {@link IInputContentUriTokenResultCallback} to be called back.

     * @param resultSupplier the supplier from which the result is provided.

     */

    public static void onResult(@NonNull IIInputContentUriTokenResultCallback callback,

    public static void onResult(@NonNull IInputContentUriTokenResultCallback callback,

            @NonNull Supplier<IInputContentUriToken> resultSupplier) {

        IInputContentUriToken result = null;

        Throwable exception = null;

core/java/com/android/internal/inputmethod/IIInputContentUriTokenResultCallback.aidl→core/java/com/android/internal/inputmethod/IInputContentUriTokenResultCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.internal.inputmethod; 
import com.android.internal.inputmethod.IInputContentUriToken;

import com.android.internal.inputmethod.ThrowableHolder;



oneway interface IIInputContentUriTokenResultCallback {

oneway interface IInputContentUriTokenResultCallback {

    void onResult(in IInputContentUriToken result);

    void onError(in ThrowableHolder exception);

}
 
 No newline at end of file

core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.view.inputmethod.InputMethodSubtype; 


import com.android.internal.inputmethod.IBooleanResultCallback;

import com.android.internal.inputmethod.IInputContentUriToken;

import com.android.internal.inputmethod.IIInputContentUriTokenResultCallback;

import com.android.internal.inputmethod.IInputContentUriTokenResultCallback;

import com.android.internal.inputmethod.IVoidResultCallback;



/**
@@ -32,7 +32,7 @@ oneway interface IInputMethodPrivilegedOperations { 
    void setImeWindowStatusAsync(int vis, int backDisposition);

    void reportStartInputAsync(in IBinder startInputToken);

    void createInputContentUriToken(in Uri contentUri, in String packageName,

            in IIInputContentUriTokenResultCallback resultCallback);

            in IInputContentUriTokenResultCallback resultCallback);

    void reportFullscreenModeAsync(boolean fullscreen);

    void setInputMethod(String id, in IVoidResultCallback resultCallback);

    void setInputMethodAndSubtype(String id, in InputMethodSubtype subtype,

core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public final class InputMethodPrivilegedOperations { 


    /**

     * Calls {@link IInputMethodPrivilegedOperations#createInputContentUriToken(Uri, String,

     * IIInputContentUriTokenResultCallback)}.

     * IInputContentUriTokenResultCallback)}.

     *

     * @param contentUri Content URI to which a temporary read permission should be granted

     * @param packageName Indicates what package needs to have a temporary read permission

core/java/com/android/internal/inputmethod/ResultCallbacks.java

+4 −4
Original line number Diff line number Diff line
@@ -223,20 +223,20 @@ public final class ResultCallbacks { 
    }



    /**

     * Creates {@link IIInputContentUriTokenResultCallback.Stub} that is to set

     * Creates {@link IInputContentUriTokenResultCallback.Stub} that is to set

     * {@link Completable.IInputContentUriToken} when receiving the result.

     *

     * @param value {@link Completable.IInputContentUriToken} to be set when receiving the result.

     * @return {@link IIInputContentUriTokenResultCallback.Stub} that can be passed as a binder IPC

     * @return {@link IInputContentUriTokenResultCallback.Stub} that can be passed as a binder IPC

     * parameter.

     */

    @AnyThread

    public static IIInputContentUriTokenResultCallback.Stub of(

    public static IInputContentUriTokenResultCallback.Stub of(

            @NonNull Completable.IInputContentUriToken value) {

        final AtomicReference<Completable.IInputContentUriToken>

                atomicRef = new AtomicReference<>(value);



        return new IIInputContentUriTokenResultCallback.Stub() {

        return new IInputContentUriTokenResultCallback.Stub() {

            @BinderThread

            @Override

            public void onResult(IInputContentUriToken result) {