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

Merge "Revise Accessibility button chooser intent/permissions" into oc-dev

Browse Source
This commit is contained in:
Casey Burkhardt
2017-04-07 02:40:11 +00:00
committed by Android (Google) Code Review
parent c56d782e13 afe3ef1b36
commit ecb5b5ccc3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/accessibility/AccessibilityManager.java
View File

@@ -113,7 +113,7 @@ public final class AccessibilityManager {
*/
@SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_CHOOSE_ACCESSIBILITY_BUTTON =
"android.intent.action.CHOOSE_ACCESSIBILITY_BUTTON";
"com.android.internal.intent.action.CHOOSE_ACCESSIBILITY_BUTTON";
static final Object sInstanceSync = new Object();

3
core/res/AndroidManifest.xml
View File

@@ -3365,6 +3365,7 @@
</intent-filter>
</activity>
<activity android:name="com.android.internal.app.AccessibilityButtonChooserActivity"
android:exported="false"
android:theme="@style/Theme.DeviceDefault.Resolver"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"
@@ -3374,7 +3375,7 @@
android:process=":ui"
android:visibleToInstantApps="true">
<intent-filter>
<action android:name="android.intent.action.CHOOSE_ACCESSIBILITY_BUTTON" />
<action android:name="com.android.internal.intent.action.CHOOSE_ACCESSIBILITY_BUTTON" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

8
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -872,10 +872,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
*/
@Override
public void notifyAccessibilityButtonClicked() {
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR)
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR_SERVICE)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Caller does not hold permission "
+ android.Manifest.permission.STATUS_BAR);
+ android.Manifest.permission.STATUS_BAR_SERVICE);
}
synchronized (mLock) {
notifyAccessibilityButtonClickedLocked();
@@ -891,10 +891,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
*/
@Override
public void notifyAccessibilityButtonAvailabilityChanged(boolean available) {
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR)
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR_SERVICE)
!= PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Caller does not hold permission "
+ android.Manifest.permission.STATUS_BAR);
+ android.Manifest.permission.STATUS_BAR_SERVICE);
}
synchronized (mLock) {
notifyAccessibilityButtonAvailabilityChangedLocked(available);