diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-14 16:36:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:36:11 +0000 |
| commit | dc28dc63a7c04dcb87e257700a1d7aea40de0ce3 (patch) | |
| tree | 8b3d36ad7422fafe2fadd544cb8275a75eee71f3 | |
| parent | d47dc7c3bd1cf9fbc549141512bc75c43454ef7c (diff) | |
| parent | 399cac5b335b7a0a0c0146c6de8b653382caae6a (diff) | |
| download | frameworks_base-dc28dc63a7c04dcb87e257700a1d7aea40de0ce3.zip frameworks_base-dc28dc63a7c04dcb87e257700a1d7aea40de0ce3.tar.gz frameworks_base-dc28dc63a7c04dcb87e257700a1d7aea40de0ce3.tar.bz2 | |
am 399cac5b: am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '399cac5b335b7a0a0c0146c6de8b653382caae6a':
Fix doc typos in AppOpsManager.java
| -rw-r--r-- | core/java/android/app/AppOpsManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index aece462..079cf7a 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -36,7 +36,7 @@ import android.os.RemoteException; * API for interacting with "application operation" tracking. * * <p>This API is not generally intended for third party application developers; most - * features are only available to system applicatins. Obtain an instance of it through + * features are only available to system applications. Obtain an instance of it through * {@link Context#getSystemService(String) Context.getSystemService} with * {@link Context#APP_OPS_SERVICE Context.APP_OPS_SERVICE}.</p> */ @@ -878,7 +878,7 @@ public class AppOpsManager { } /** - * Like {@link #checkOp but instead of throwing a {@link SecurityException} it + * Like {@link #checkOp} but instead of throwing a {@link SecurityException} it * returns {@link #MODE_ERRORED}. */ public int checkOpNoThrow(String op, int uid, String packageName) { |