Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a4c1b0a7: Merge "Fixing the build for real." into jb-dev

Browse Source 
* commit 'a4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91':
  Fixing the build for real.
This commit is contained in:
Svetoslav Ganov
2012-05-16 19:30:01 -07:00
committed by Android Git Automerger
parent e262d4bdbd a4c1b0a7ca
commit 765cbbe74f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/accessibilityservice/AccessibilityService.java
View File

@@ -60,8 +60,7 @@ import com.android.internal.os.HandlerCaller;
* must also specify that it handles the "android.accessibilityservice.AccessibilityService" * must also specify that it handles the "android.accessibilityservice.AccessibilityService"
* {@link android.content.Intent}. Failure to declare this intent will cause the system to * {@link android.content.Intent}. Failure to declare this intent will cause the system to
* ignore the accessibility service. Additionally an accessibility service must request * 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 * can bind to it. Failure to declare this intent will cause the system to ignore the
* accessibility service. Following is an example declaration: * accessibility service. Following is an example declaration:
* </p> * </p>

3
core/res/AndroidManifest.xml
View File

@@ -1552,7 +1552,8 @@
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<!-- Must be required by an {@link android.accessibilityservice.AccessibilityService}, <!-- 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" <permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"
android:label="@string/permlab_bindAccessibilityService" android:label="@string/permlab_bindAccessibilityService"
android:description="@string/permdesc_bindAccessibilityService" android:description="@string/permdesc_bindAccessibilityService"