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

Commit d894c395 authored by Ameer Armaly's avatar Ameer Armaly
Browse files

Permission-annotate IMagnificationConnectionCallback and IRemoteMagnificationAnimationCallback 

Fix: 316614450
Test: Lint + presubmit tests
Change-Id: I495c1006226b909b7ae61c74e233e2fb7e67b2e1
parent 8ecc4567

core/java/android/view/accessibility/IMagnificationConnectionCallback.aidl

+7 −1
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * Licensed under the Apache License, Veorsion 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *
@@ -32,6 +32,7 @@ import android.graphics.Rect; 
     * @param displayId The logical display id.

     * @param bounds The window magnifier bounds in screen coordinates.

     */

    @RequiresNoPermission

    void onWindowMagnifierBoundsChanged(int displayId, in Rect bounds);



    /**
@@ -41,6 +42,7 @@ import android.graphics.Rect; 
     * @param displayId The logical display id.

     * @param magnificationMode new magnification mode.

     */

    @RequiresNoPermission

    void onChangeMagnificationMode(int displayId, int magnificationMode);



    /**
@@ -49,6 +51,7 @@ import android.graphics.Rect; 
     * @param displayId The logical display id.

     * @param sourceBounds The magnified bounds in screen coordinates.

     */

    @RequiresNoPermission

    void onSourceBoundsChanged(int displayId, in Rect sourceBounds);



    /**
@@ -59,6 +62,7 @@ import android.graphics.Rect; 
     * @param scale the target scale, or {@link Float#NaN} to leave unchanged

     * @param updatePersistence whether the new scale should be persisted in Settings

     */

    @RequiresNoPermission

    void onPerformScaleAction(int displayId, float scale, boolean updatePersistence);



    /**
@@ -66,6 +70,7 @@ import android.graphics.Rect; 
     *

     * @param displayId The logical display id.

     */

    @RequiresNoPermission

    void onAccessibilityActionPerformed(int displayId);



    /**
@@ -73,6 +78,7 @@ import android.graphics.Rect; 
     *

     * @param displayId The logical display id.

     */

    @RequiresNoPermission

    void onMove(int displayId);



}

core/java/android/view/accessibility/IRemoteMagnificationAnimationCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ package android.view.accessibility; 
     * @param success {@code true} if animating successfully with given spec or the spec did not

     *                change. Otherwise {@code false}

     */

     @RequiresNoPermission

    void onResult(boolean success);

}

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.server.accessibility.AccessibilityManagerService.MAGNI 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresNoPermission;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -939,11 +940,11 @@ public class MagnificationConnectionManager implements 
        disableWindowMagnification(displayId, true);

    }



    @SuppressWarnings("MissingPermissionAnnotation")

    private class ConnectionCallback extends IMagnificationConnectionCallback.Stub implements

            IBinder.DeathRecipient {

        private boolean mExpiredDeathRecipient = false;



        @RequiresNoPermission

        @Override

        public void onWindowMagnifierBoundsChanged(int displayId, Rect bounds) {

            if (mTrace.isA11yTracingEnabledForTypes(
@@ -965,6 +966,7 @@ public class MagnificationConnectionManager implements 
            }

        }



        @RequiresNoPermission

        @Override

        public void onChangeMagnificationMode(int displayId, int magnificationMode)

                throws RemoteException {
@@ -977,6 +979,7 @@ public class MagnificationConnectionManager implements 
            mCallback.onChangeMagnificationMode(displayId, magnificationMode);

        }



        @RequiresNoPermission

        @Override

        public void onSourceBoundsChanged(int displayId, Rect sourceBounds) {

            if (mTrace.isA11yTracingEnabledForTypes(
@@ -995,6 +998,7 @@ public class MagnificationConnectionManager implements 
            mCallback.onSourceBoundsChanged(displayId, sourceBounds);

        }



        @RequiresNoPermission

        @Override

        public void onPerformScaleAction(int displayId, float scale, boolean updatePersistence) {

            if (mTrace.isA11yTracingEnabledForTypes(
@@ -1007,6 +1011,7 @@ public class MagnificationConnectionManager implements 
            mCallback.onPerformScaleAction(displayId, scale, updatePersistence);

        }



        @RequiresNoPermission

        @Override

        public void onAccessibilityActionPerformed(int displayId) {

            if (mTrace.isA11yTracingEnabledForTypes(
@@ -1018,6 +1023,7 @@ public class MagnificationConnectionManager implements 
            mCallback.onAccessibilityActionPerformed(displayId);

        }



        @RequiresNoPermission

        @Override

        public void onMove(int displayId) {

            if (mTrace.isA11yTracingEnabledForTypes(

services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.os.IBinder.DeathRecipient; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresNoPermission;

import android.os.RemoteException;

import android.util.Slog;

import android.view.accessibility.IMagnificationConnection;
@@ -262,7 +263,6 @@ class MagnificationConnectionWrapper { 
        return new RemoteAnimationCallback(callback, trace);

    }



    @SuppressWarnings("MissingPermissionAnnotation")

    private static class RemoteAnimationCallback extends

            IRemoteMagnificationAnimationCallback.Stub {

        private final MagnificationAnimationCallback mCallback;
@@ -279,6 +279,7 @@ class MagnificationConnectionWrapper { 
            }

        }



        @RequiresNoPermission

        @Override

        public void onResult(boolean success) throws RemoteException {

            mCallback.onResult(success);