Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check for IInputMethodPrivilegedOperations" into sc-dev

Browse Source
This commit is contained in:
Wilson Wu
2021-04-08 02:03:29 +00:00
committed by Android (Google) Code Review
parent 45dc22e11c fa57a2e068
commit 3d8971e4fa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/com/android/internal/inputmethod/InputMethodPrivilegedOperations.java
View File

@@ -18,6 +18,7 @@ package com.android.internal.inputmethod;
import android.annotation.AnyThread; import android.annotation.AnyThread;
import android.annotation.DrawableRes; import android.annotation.DrawableRes;
import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.net.Uri; import android.net.Uri;
import android.os.IBinder; import android.os.IBinder;
@@ -28,6 +29,8 @@ import android.view.inputmethod.InputMethodSubtype;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import java.util.Objects;
/** /**
* A utility class to take care of boilerplate code around IPCs. * A utility class to take care of boilerplate code around IPCs.
*/ */
@@ -47,7 +50,7 @@ public final class InputMethodPrivilegedOperations {
* @param privOps Binder interface to be set * @param privOps Binder interface to be set
*/ */
@AnyThread @AnyThread
public synchronized void set(IInputMethodPrivilegedOperations privOps) { public synchronized void set(@NonNull IInputMethodPrivilegedOperations privOps) {
if (mPrivOps != null) { if (mPrivOps != null) {
throw new IllegalStateException( throw new IllegalStateException(
"IInputMethodPrivilegedOperations must be set at most once." "IInputMethodPrivilegedOperations must be set at most once."
@@ -90,7 +93,8 @@ public final class InputMethodPrivilegedOperations {
* @param privOps Binder interface to be set * @param privOps Binder interface to be set
*/ */
@AnyThread @AnyThread
public void set(IInputMethodPrivilegedOperations privOps) { public void set(@NonNull IInputMethodPrivilegedOperations privOps) {
Objects.requireNonNull(privOps, "privOps must not be null");
mOps.set(privOps); mOps.set(privOps);
} }