summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-05-16 19:25:59 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-16 19:25:59 -0700
commita4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91 (patch)
tree74e024f7d108494ad1a63aa455de65e914be31dd /core
parent11e123f7684378578242f5824e14ddba2f68d9ca (diff)
parent1e7456ba74f93cdf80dc430aa082cc3c271b30b1 (diff)
downloadframeworks_base-a4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91.zip
frameworks_base-a4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91.tar.gz
frameworks_base-a4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91.tar.bz2
Merge "Fixing the build for real." into jb-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/accessibilityservice/AccessibilityService.java3
-rw-r--r--core/res/AndroidManifest.xml3
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java
index ce82a98..ebe2b98 100644
--- a/core/java/android/accessibilityservice/AccessibilityService.java
+++ b/core/java/android/accessibilityservice/AccessibilityService.java
@@ -60,8 +60,7 @@ import com.android.internal.os.HandlerCaller;
* must also specify that it handles the "android.accessibilityservice.AccessibilityService"
* {@link android.content.Intent}. Failure to declare this intent will cause the system to
* ignore the accessibility service. Additionally an accessibility service must request
- * {@link android.Manifest.permission#BIND_ACCESSIBILITY_SERVICE
- * android.permission.BIND_ACCESSIBILITY_SERVICE} permission to ensure that only the system
+ * "android.permission.BIND_ACCESSIBILITY_SERVICE" permission to ensure that only the system
* can bind to it. Failure to declare this intent will cause the system to ignore the
* accessibility service. Following is an example declaration:
* </p>
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 04a29e7..e3082ea 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1552,7 +1552,8 @@
android:protectionLevel="signature" />
<!-- Must be required by an {@link android.accessibilityservice.AccessibilityService},
- to ensure that only the system can bind to it. -->
+ to ensure that only the system can bind to it.
+ @hide -->
<permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"
android:label="@string/permlab_bindAccessibilityService"
android:description="@string/permdesc_bindAccessibilityService"