am 0d8513ad: Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev

* commit '0d8513adcacbbbc88b5228ad6fca12a38c721fce':
  Add a permission annotation to IMM#setCurrentInputMethodSubtype.

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

@@ -24,6 +24,7 @@ import com.android.internal.view.IInputMethodManager;
 import com.android.internal.view.IInputMethodSession;
 import com.android.internal.view.InputBindResult;
 
+import android.annotation.RequiresPermission;
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.Rect;
@@ -60,6 +61,8 @@ import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
+
 /**
  * Central system API to the overall input method framework (IMF) architecture,
  * which arbitrates interaction between applications and the current input method.
@@ -1976,6 +1979,7 @@ public final class InputMethodManager {
      * @return true if the current subtype was successfully switched. When the specified subtype is
      * null, this method returns false.
      */
+    @RequiresPermission(WRITE_SECURE_SETTINGS)
     public boolean setCurrentInputMethodSubtype(InputMethodSubtype subtype) {
         synchronized (mH) {
             try {