diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-14 16:32:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 16:32:24 +0000 |
| commit | 399cac5b335b7a0a0c0146c6de8b653382caae6a (patch) | |
| tree | 9e0cd320bf4f2217bfb9ccef920e844ecb84cab2 | |
| parent | 7238585e2eea81d416e3e98c283e99c3a9a38a1a (diff) | |
| parent | 75985bbe2f04519cc663db7ad54e8e69f3eabfc0 (diff) | |
| download | frameworks_base-399cac5b335b7a0a0c0146c6de8b653382caae6a.zip frameworks_base-399cac5b335b7a0a0c0146c6de8b653382caae6a.tar.gz frameworks_base-399cac5b335b7a0a0c0146c6de8b653382caae6a.tar.bz2 | |
am 75985bbe: am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs
* commit '75985bbe2f04519cc663db7ad54e8e69f3eabfc0':
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) { |