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

Commit 41b094f7 authored by Yohei Yukawa's avatar Yohei Yukawa
Browse files

Use correct @*Res annotation for updateStatusIcon() 

There was a small mistake in my previous CL [1].

What updateStatusIcon() takes is a resource ID for Drawable, not ID
for an integer value.

These @*Res annotations are still just hints for IDE and lint tools.
They are actually all @Retention(SOURCE) hence this kind of mistake
has no impact at run time actually.

This CL also adds the right annotation for corresponding methods in
InputMethodManager and InputMethodManagerService.

 [1]: I995c4b922f91b94438c1292392b2c3030598594f
      c7ca3684

Bug: 114418674
Test: atest CtsInputMethodTestCases CtsInputMethodServiceHostTestCases
Change-Id: Id7fd610c07643c79b8ec03efbda24b3dc0686844
parent d172e22a

core/java/android/view/inputmethod/InputMethodManager.java

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.view.inputmethod; 


import static android.Manifest.permission.WRITE_SECURE_SETTINGS;



import android.annotation.DrawableRes;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresFeature;
@@ -776,7 +777,7 @@ public final class InputMethodManager { 
     * class are intended for app developers interacting with the IME.

     */

    @Deprecated

    public void showStatusIcon(IBinder imeToken, String packageName, int iconId) {

    public void showStatusIcon(IBinder imeToken, String packageName, @DrawableRes int iconId) {

        mPrivOpsRegistry.get(imeToken).updateStatusIcon(packageName, iconId);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.inputmethod;



import android.annotation.AnyThread;

import android.annotation.IdRes;

import android.annotation.DrawableRes;

import android.annotation.Nullable;

import android.net.Uri;

import android.os.IBinder;
@@ -199,7 +199,7 @@ public final class InputMethodPrivilegedOperations { 
     * @param iconResId resource ID of the icon to be loaded

     */

    @AnyThread

    public void updateStatusIcon(String packageName, @IdRes int iconResId) {

    public void updateStatusIcon(String packageName, @DrawableRes int iconResId) {

        final IInputMethodPrivilegedOperations ops = mOps.getAndWarnIfNull();

        if (ops == null) {

            return;

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

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.accessibilityservice.AccessibilityService; 
import android.annotation.AnyThread;

import android.annotation.BinderThread;

import android.annotation.ColorInt;

import android.annotation.DrawableRes;

import android.annotation.IntDef;

import android.annotation.MainThread;

import android.annotation.NonNull;
@@ -2114,7 +2115,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    }



    @BinderThread

    private void updateStatusIcon(@NonNull IBinder token, String packageName, int iconId) {

    private void updateStatusIcon(@NonNull IBinder token, String packageName,

            @DrawableRes int iconId) {

        synchronized (mMethodMap) {

            if (!calledWithValidToken(token)) {

                return;
@@ -5034,7 +5036,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


        @BinderThread

        @Override

        public void updateStatusIcon(String packageName, int iconId) {

        public void updateStatusIcon(String packageName, @DrawableRes int iconId) {

            mImms.updateStatusIcon(mToken, packageName, iconId);

        }