Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3882829 authored by Casey Burkhardt's avatar Casey Burkhardt Committed by android-build-merger
Browse files

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

am: bc411cd4

Change-Id: I0a085365593d05a77eab013259c2a36ce2c39f1a
parents e880abf5 bc411cd4

core/java/android/view/accessibility/AccessibilityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,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();

core/res/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -3381,6 +3381,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"
@@ -3390,7 +3391,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>

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -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);