diff options
| author | Yoshiki Iguchi <yoshiki@google.com> | 2015-06-03 06:05:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 06:05:37 +0000 |
| commit | 0d8513adcacbbbc88b5228ad6fca12a38c721fce (patch) | |
| tree | 9da5ed26a3e324557d32fecffd7647c58b584c7d /core/java/android | |
| parent | 0326f7772cad003b1bc6b3d7c39429bf53333eb8 (diff) | |
| parent | 00d5122b2b59ca86b6278304c666211c4b39cc35 (diff) | |
| download | frameworks_base-0d8513adcacbbbc88b5228ad6fca12a38c721fce.zip frameworks_base-0d8513adcacbbbc88b5228ad6fca12a38c721fce.tar.gz frameworks_base-0d8513adcacbbbc88b5228ad6fca12a38c721fce.tar.bz2 | |
Merge "Add a permission annotation to IMM#setCurrentInputMethodSubtype." into mnc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 5537b3e..053b35c 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/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 { |