Merge "Add null check for IInputMethodPrivilegedOperations" into sc-dev (3d8971e4) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.inputmethod;

		import android.annotation.AnyThread;
		import android.annotation.DrawableRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.net.Uri;
		import android.os.IBinder;
		@@ -28,6 +29,8 @@ import android.view.inputmethod.InputMethodSubtype;

		import com.android.internal.annotations.GuardedBy;

		import java.util.Objects;

		/**
		* 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
		*/
		@AnyThread
		public synchronized void set(IInputMethodPrivilegedOperations privOps) {
		public synchronized void set(@NonNull IInputMethodPrivilegedOperations privOps) {
		if (mPrivOps != null) {
		throw new IllegalStateException(
		"IInputMethodPrivilegedOperations must be set at most once."
		@@ -90,7 +93,8 @@ public final class InputMethodPrivilegedOperations {
		* @param privOps Binder interface to be set
		*/
		@AnyThread
		public void set(IInputMethodPrivilegedOperations privOps) {
		public void set(@NonNull IInputMethodPrivilegedOperations privOps) {
		Objects.requireNonNull(privOps, "privOps must not be null");
		mOps.set(privOps);
		}